Re: Automerge algorithm ...
From: Ryan Schmidt <subversion-2006q2_at_ryandesign.com>
Date: 2006-06-07 18:20:22 CEST
On Jun 6, 2006, at 21:48, Javier Ruiz wrote:
> We use subversion extensively in our projects and thus far we've
A merge is nothing more than diff and patch.
Let's say you were going to merge a change from revision 42 of a
$ cd trunk
All Subversion is doing is getting a diff between revision 41 and 42
$ svn diff
To show you that this is in fact the same as the diff between those
$ svn diff -r41:42 $REPO/project1/branches/branch1
Do note that although these text representations of diffs don't show
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.