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

Re: Merger not Merging -- What I would like a merge process to do.

From: matthew ford <matthew.ford_at_forward.com.au>
Date: 2005-01-26 01:00:15 CET

Hi all,

After a lot of helpful answers from this list, (and some on going
discussions on TSVN) I think the problem with merge for me, as a new user,
is that it was concieved as an enhanced diff/patch.
However to a new user who has never used diff (me), the necessary history is
missing and hence many of my mis-understandings.

In hindsight it would have been easier for me to understand if merge had
been designed from the ground up so that
svn merge branch trunk . would merge from branch to the trunk and
update the local WC of trunk
and
svn merge -r 100:200 trunk . would merge revisions 100 (inclusive) to
200 (inclusive) to the local WC

I think the svn docs could be improved by including a little more on diff.
Such as the explaination
"the diff between what was and what is when applied (patched) to someone
elses what was will make theirs what is"
or some such would have helped a lot. (This should be repeated in both the
discussion of diff and merge)

Then, rememebering that merge is an enhanced diff/patch, the above statement
makes sense of
svn merge branch trunk .
assuming the current WC is the branch then this merge patches the current WC
upto trunk.

Yes simple I know but to a new user not at all obvious.
matthew

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 26 01:02:41 2005

This is an archived mail posted to the Subversion Users mailing list.