RE: Behaviour of reintegrate in 1.7.1
From: James French <James.French_at_naturalmotion.com>
Date: Wed, 26 Oct 2011 12:09:24 +0100
On Wed, Oct 26, 2011 at 10:02:17AM +0100, James French wrote:
This is correct.
> Once the reintegration was complete you could update to merge in
Not sure what you mean here, this is very unclear.
After you've merged into working copy you can't check in until that working copy is up to date, hence updating to get latest changes which are then 'merged in' to your working copy. I shouldn't have used the term 'merge' as it was confusing.
>Am I correct in this?
Thanks. I solved my immediate problem by doing a 2 way merge and bypassing the reintegrate checking.
> With 1.7.1 (tortoisesvn), it seemed that this might not be the case.
No idea. Can you please show the exact error message you got?
Sorry, its gone. It was a load of missing revisions on a load of different files and folders.
From where I stand it sounds as if you simply haven't closed all gaps
But maybe this is a separate problem related to the sparse working copy?
I'm not really in a position to do that right now but as I evaluate 1.7 I intend to build up a test suite so I can really get to grips with how things are working. Sorry about that, its a bit lame but work deadlines and all...
> I did not look much further than this, but this seemed fishy so I
I hope that 1.7 will improve things for you.
I am sure it will. Thanks for all your help, and for tortoisesvn.
This is an archived mail posted to the Subversion Users mailing list.