Some revisions have been merged under it that have not been merged into the reintegration target

[Robin Guest]

I'm using TortoiseSVN 1.5.4.14259 on XP SP2, for Subversion 1.5.3
Windows Server 2003.

I'm trying to merge reintegrate a branch back to trunk, using the Reintegrate a Branch option, and I get the error:

Command: Reintegrate merge svn://192.168.0.4/ProspectSoft Development/Applications/BridgeLicensing/DllCreation/branches/V4 into C:\Documents and Settings\robin.guest.THORNEWIDGERY\My Documents\Delphi Projects\DllCreation  

Error: Cannot reintegrate from   

Error: 'svn://192.168.0.4/ProspectSoft%20Development/Applications/BridgeLicensing/DllCreation/branches/V4'   

Error: yet:  

Error: Some revisions have been merged under it that have not been merged  

Error: into the reintegration target; merge them first, then retry.  

Finished!:   

From the documentation: "There are some conditions which apply to a reintegrate merge. Firstly, the server must support merge tracking. The working copy must be of depth infinite (no sparse checkouts), and it must not have any local modifications, switched items or items that have been updated to revisions other than HEAD. All changes to trunk made during branch development must have been merged across to the branch (or marked as having been merged). The range of revisions to merge will be calculated automatically."

Firstly, the server must support merge tracking. 1.5.3, YES I THINK SO

The working copy must be of depth infinite YES

(no sparse checkouts) NO

and it must not have any local modifications NO

switched items NO

or items that have been updated to revisions other than HEAD NO

All changes to trunk made during branch development must have been merged across to the branch YES

(or marked as having been merged) NONE OF THOSE

There were only three revisions made to trunk since the branch was created, all done by me, and all successfully merged into the branch as I went along. There is another separate branch made from trunk before I made mine, but the dev is not nearly ready to reintegrate his yet.

Feeling a bit panicky at the moment because this is my first merge, and there is a fair bit of work invested in that branch, but hopefully the fix is something simple. 

Please advise. Thanks, Robin

[Robin Guest]

2009/3/15 Robin Guest <robin...@gmail.com>

I'm trying to merge reintegrate a branch back to trunk, using the Reintegrate a Branch option, and I get the error:

Command: Reintegrate merge svn://192.168.0.4/ProspectSoft Development/Applications/BridgeLicensing/DllCreation/branches/V4 into C:\Documents and Settings\robin.guest.THORNEWIDGERY\My Documents\Delphi Projects\DllCreation  

Error: Cannot reintegrate from   

Error: 'svn://192.168.0.4/ProspectSoft%20Development/Applications/BridgeLicensing/DllCreation/branches/V4'   

Error: yet:  

Error: Some revisions have been merged under it that have not been merged  

Error: into the reintegration target; merge them first, then retry.  

Finished!:   

I'm happy to provide more information to the list, if my first post is insufficient to enable anyone to help me.

Thank you, Robin

[Robin Guest]

2009/3/15 Robin Guest <robin...@gmail.com>

Error: Some revisions have been merged under it that have not been merged  

Error: into the reintegration target; merge them first, then retry.  

I'm happy to provide more information to the list, if my first post is insufficient to enable anyone to help me.

In the meantime I started to make a list of questions about the things that don't make sense in the error message:

1) What is "it"?

2) What is "the reintegration target"?

3) What does "merged under" mean?

4) What command should I do to get it to tell me me those revisions have been "merged under" "it" that have not been merged into "the reintegration target"?

5) Once I've found out those revisions, how do I merge them, given that I think I've merged everything I possibly can apart from this failing merge?

If "it" is the branch and "the reintegration target" is the trunk and "merged under" means a merge from the branch to the trunk, then I can't see how that is true - all revisions in the branch have been either merged from the trunk or committed directly there. A merge from the branch to the trunk is exactly what I'm trying to do now.

[Stefan Küng]

Robin Guest wrote:
> I'm using TortoiseSVN 1.5.4.14259 on XP SP2, for Subversion 1.5.3
> Windows Server 2003.
>
> I'm trying to merge reintegrate a branch back to trunk, using
> the Reintegrate a Branch option, and I get the error:
>
> Command: Reintegrate merge svn://192.168.0.4/ProspectSoft

> <http://192.168.0.4/ProspectSoft>

> Development/Applications/BridgeLicensing/DllCreation/branches/V4 into
> C:\Documents and Settings\robin.guest.THORNEWIDGERY\My Documents\Delphi
> Projects\DllCreation
> Error: Cannot reintegrate from
> Error:
> 'svn://192.168.0.4/ProspectSoft%20Development/Applications/BridgeLicensing/DllCreation/branches/V4

> <http://192.168.0.4/ProspectSoft%20Development/Applications/BridgeLicensing/DllCreation/branches/V4>'

>
> Error: yet:
> Error: Some revisions have been merged under it that have not been merged
> Error: into the reintegration target; merge them first, then retry.
> Finished!:
>
> From the documentation: "There are some conditions which apply to a
> reintegrate merge. Firstly, the server must support merge tracking. The
> working copy must be of depth infinite (no sparse checkouts), and it
> must not have any local modifications, switched items or items that have
> been updated to revisions other than HEAD. All changes to trunk made
> during branch development must have been merged across to the branch (or
> marked as having been merged). The range of revisions to merge will be
> calculated automatically."
>
> Firstly, the server must support merge tracking. 1.5.3, YES I THINK SO
> The working copy must be of depth infinite YES
> (no sparse checkouts) NO
> and it must not have any local modifications NO
> switched items NO
> or items that have been updated to revisions other than HEAD NO
> All changes to trunk made during branch development must have been
> merged across to the branch YES
> (or marked as having been merged) NONE OF THOSE

Some more (which you might have missed):
* the branch must have been created with an 1.5 client supporting merge
tracking
* all merges since then must have been done with an 1.5 client too

Anyway: you can work around that by specifying a revision range for the
merge instead of using the reintegrate feature.

If you still have problems, you might want to ask on the Subversion
users list where you might get more help about merging in general.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1334411

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Robin Guest]

2009/3/16 Stefan Küng <torto...@gmail.com>

Robin Guest wrote: 

> Error: Some revisions have been merged under it that have not been merged

> Error: into the reintegration target; merge them first, then retry.

Anyway: you can work around that by specifying a revision range for the
merge instead of using the reintegrate feature.

Thank you, that worked perfectly. I was a bit too timid to try that on my own, but as the documentation says, you can safely revert any merge before you commit it.

Now I wonder if the problem was because I had some externals ("under it?!"), to which I'd committed changes from within that working copy. The externals were present in both the trunk and branch, but they had relocated to a different place in the repository for the branch. Could that have been enough to confuse reintegrate, I wonder.

Cheers, Robin

[Mike Dixon]

Robin Guest wrote:
> 2009/3/16 Stefan Küng <torto...@gmail.com
> <mailto:torto...@gmail.com>>

>
> Robin Guest wrote:
>
> > Error: Some revisions have been merged under it that have not
> been merged
> > Error: into the reintegration target; merge them first, then retry.
>

Short story: This has been fixed already, but you're not using the
latest version.

Long story: This error used to be raised when you have svn:mergeinfo
properties on any files or folders in your branch, not including the
merge source (AKA "it").

Example: Reintegrating "http://server/svn/repo/branches/foo" into
"http://server/svn/repo/trunk".
/trunk has mergeinfo
/trunk/bar has mergeinfo
/branches/foo has mergeinfo ---> no error.
/branches/foo/bar svn:mergeinfo ---> error.

The reason there's an error is because the presence of svn:mergeinfo on
/branches/foo/bar means that it might have different mergeinfo than
/branches/foo, which would make it impossible for reintegrate to figure
out what to do.

In practice, 99% of the time the reason /foo/bar has mergeinfo is
because it was copied or renamed at some point, and it has the exact
same svn:mergeinfo property as /foo. The most recent version of
subversion is a lot smarter about looking at the actual values of
svn:mergeinfo properties during reintegrate, and so you likely won't see
the error anymore if you upgrade.

-Mike

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1335333

[Robin Guest]

2009/3/16 Mike Dixon <michae...@denovosoftware.com>

Short story: This has been fixed already, but you're not using the

latest version.

Long story: This error used to be raised when you have svn:mergeinfo
properties on any files or folders in your branch, not including the
merge source (AKA "it").

Nice explanation, thanks Mike. I'm planning to upgrade when 1.6.0 is released.

[Alexander Orlov]

On Mar 17, 12:24 pm, Robin Guest <robin.gu...@gmail.com> wrote:
> > Long story: This error used to be raised when you have svn:mergeinfo
> > properties on any files or folders in your branch, not including the
> > merge source (AKA "it").

Right :)

Just go into the root directory of your SVN copy and execute:

svn -R pd svn:mergeinfo ./
svn ci -m "svn:mergeinfo property DELETED from everywhere"

cd to your trunk WC
Afterwards you should be able to execute commands like:

svn --reintegrate --dry-run merge ../../branches/
my.branch.which.should.be.integrated.in.trunk

...from your trunk WC.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1934895