[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Show merged revisions in log

From: Wim Coenen <wcoenen_at_gmail.com>
Date: Sun, 21 Sep 2008 15:18:54 +0200

2008/9/21 golan davidovits <golandav_at_yahoo.com>:

> In addition, i continued the test and made a change in branch and tried to "reintegrate" it back to trunk.
> The result was the following error:
>
> Error: Cannot reintegrate from <branch> yet
> Error: Some revisions have been merged under it that have not been merged
> Error: into the reintegration target; merge them first, then retry.
>
> Can you please explain why it happens?? No new revision was added to the trunk since my trunk>branch merge.
>

First, note that "reintegrate branch" is only intended for short-lived
feature branches which are deleted
after the feature is merged back to the trunk. It's not clear from
your question whether you are trying to use
"reintegrate branch" in this context.

"reintegrate branch" refuses to do a merge if the merge source has
subtree mergeinfo. It is explained at
http://blogs.open.collab.net/svn/2008/07/subversion-merg.html. (Brian
Gideon has just posted this link
in another related thread "Question to Merging and Merge Tracking").

Best practice is to do merges only at the branch level, which will
avoid subtree mergeinfo. But even if you stick to
this rule, subversion will still create subtree mergeinfo if you
copy/move files in the branch. Subversion is not yet
smart enough to detect that the subtree mergeinfo is not necessary in
most of those cases.

One way to fix this is to just delete all subtree mergeinfo on your
feature branch before trying to reintegrate it.

Also, the error will never occur if you explicitly "merge a range of
revisions" instead of using "reintegrate branch".

HTH,

Wim Coenen

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-21 15:19:05 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.