Svn merge — Apply the differences between two sources to a working copy path. Then the peg revisions must be explicitly stated. About merge operations when the two merge sources are ancestrally related—if the first source is an ancestor of the second or vice versa—this is guaranteed to be the case when using the first two forms. 2 messages in org.tigris.subversion.dev 'must be ancestrally related'. From Sent On Attachments; Jack Bates: Nov 3, 2008 1:26 pm David Glasser: Nov 3, 2008 2:10 pm. Re: 'must be ancestrally related' If you do 'svn cp a b' and 'a' is a locally-added-not-yet-committed file, it won't save copyfrom information, because copyfrom always has to point to a previous revision. If Merge Tracking is active, then Subversion will internally track metadata (i.e. The svn:mergeinfo property) about merge operations when the two merge sources are ancestrally related—if the first source is an ancestor of the second or vice versa—this is guaranteed to.

Svn Merge Must Be Ancestrally Related To

On 01.02.2010 05:06, Andrew Cushen wrote:
> Stefan:
>
> OK, I can see the previous revisions now-- but _only_ when I look at the
> original folder in the original location. When I look at the trunk in the
> new folder, it only shows revisions back to when we moved the files into the
> new folder. In fact, when I look at the log in the new folder, it refuses to
> allow me to set the 'From:' date back past the date the new folders were
> created. Is this expected behavior? It seems that SVN does not see that the
> trunk in the new folder is the same trunk as the one in the original folder.
> It's as if I 'disconnected' the trunk when I moved it to the new folder in
> the Repo-browser.

The from/to date selectors are only for filtering what's already loaded.
If you want to use dates to fetch the log, use the 'show all' button
(press on the arrow, then choose 'revision range' from the menu and
enter the dates in the svn format).

>
> And, more importantly, the need that led to the original question: after
> moving the trunk to a different folder in the Repo-browser, we created a dev
> branch from the trunk in the new folder, which we are now unable to merge
> back to the trunk in the new folder. When we try to do this, following the
> Help file's instructions to check out the trunk in its new location to the
> working copy, then try to merge the dev branch, we do a Test Merge, and get
> this message:
>
> Error '[dev branch] must be ancestrally related to [trunk]@327'
>
> So, it seems that SVN also thinks our dev branch, created off the trunk in
> the new folder, is not related to the trunk it was created from! We have
> tried setting the Merge Depth to 'Fully recursive', and also to 'Working
> copy' but both ways result in the same error when we try a Test merge.
>
> Any ideas? I have just upgraded our VisualSVN server to 2.0.8, TortoiseSVN
> on the clients to 1.6.7, and VisualSVN to
> 1.7.7.

Sure, you've replaced the trunk. The dev branch you originally created
is ancestrally related to the original trunk, not the new one you
created. Use the merge dialog and check the box 'ignore ancestry' on the
last page of the merge wizard.

Stefan

Svn マージ Must Be Ancestrally Related To

Received on 2010-02-01 19:33:30 CET