RE: resolve conflict dialog is confusing
From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Wed, 1 Sep 2010 16:48:39 -0400
> On Sep 1, 2010, at 2:14 PM, Tom von Alten wrote:
I'm not sure that is really 100% correct. My understanding of a merge is that a diff is taken of two locations and that diff is applied to your current working copy. From the red-bean svn book:
--- "The main source of confusion is the name of the command. The term "merge" somehow denotes that branches are combined together, or that some sort of mysterious blending of data is going on. That's not the case. A better name for the command might have been svn diff-and-apply, because that's all that happens: two repository trees are compared, and the differences are applied to a working copy." --- So, you can merge the diffs between the paths of two different repositories. I don't recall when it was added that you can diff separate repos... but I think it has been doable since some time after 1.5. BOb ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2654275 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].Received on 2010-09-01 22:48:55 CEST |
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.