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

Re: Merging problems

From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Mon, 1 Jun 2009 12:26:01 +0200

> I'm trying to merge a few simple revisions made on a branch back to the
> trunk and cannot seem to get it to work. All of the changes made on the
> branch need to be merged back.

Don't give up! The branching/mergeing works really well when you stick to a few (*cough*) basic rules!

> If I choose "Reintegrate a branch" and then pick the branch where I made
> my changes, I get the following error when I try and merge:
> "Error: Cannot reintegrate into a working copy not entirely at infinite
> depth " (and I have no idea what that means!).
You should use "Reintegrate a branch" in the situation you describe. You just have to fix the problems that prevent your merge (and these may be mutiple). And DO NOT FORGET to delete the entire branch after you are don reintegrating it.
It looks like some parts of your working copy have gone missing, or that you have manually made a sparse checkout. (See http://svnbook.red-bean.com/en/1.5/svn.advanced.sparsedirs.html for details.)
Try doing an update on your entire working copy. If that fails to resolve your problem do an "Update to revision" on the working copy and set "Update depth" to "Fully recursive". (I'm not sure when this functionality was introduced, but it's avaliable in the latest nightly, and I think in the latest official release as well.)
> If I do it the old way ("Merge a range of revisions")
Don't do that. You should really use "Reintegrate a branch" for this use case.

> Since TortoiseSVN introduced the dialog where you select one of three
> options to perform a merge, I've NEVER been able to successfully do a
> merge
Keep trying untill you get it right. Merges only* fail to prevent you from potentially shooting yourself in the foot.
And please use the user-list for further usage related questions!
I can also refer to an earlier post where I summarizes some "best practices" for branching/mergeing with svn 1.5+:
Good luck!


To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-01 12:26:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.