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

Re: Merging problems PS

From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Tue, 2 Jun 2009 16:49:12 +0200

>> I'm not sure what's changed but I now get the following error for any
>> type of merge:
> I've never been that happy with the "reintegrate" merge function. It
> rarely works :)

I think that the worst thing about Reintegrate Merge is the documentation. Reintegrate Merge will only work under some quite strict conditions, and I think this is not made clear enough in the docs.
When all preconditions for using Reintegrate Merge are met, it will do great job of keeping potentially difficult merges as effortless as possible. As far as I understand, Reintegrate Merge will never do anything if it's not 100% sure of that it's the right thing to do. It will fail before starting to guess and create a potentially "broken" merge, and that is a very desireable behavior if you ask me.
I happen to know another versioning system that during merging will, when in doubt, sometimes simply make a guess about what to do. It will thus occasionaly (and silently) do the wrong thing, effectively leaving it up to you to try to understand why that broken change that was removed weeks ago somehow made it back into trunk again.
In other words: I'm quite fond of Reintegrate Merge (so far). :-)
(And for those cases when the requirements of Reintegrate Merge are to strict there is always the regular merge, but then you won't have that extra help and safety that Reintegrate Merge will give you.)


To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-02 16:49:28 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.