Will Dean <svn@indcomp.co.uk> wrote on 01/25/2005 09:29:17 AM:
> At 09:11 25/01/2005 -0500, you wrote:
>
> >On the N-1 issue, how long are people really going to be confused about
> >this? I mean, certainly you are not still confused about it. Sure the
> >first couple times you might be a bit confused, but then hopefully most
> >people will get it. There is nothing illogical about what Subversion
is
> >doing, it is just a generally confusing operation no matter what you
do.
>
> In which case, we need a better explanation in the helpfile of why this
is
> so. It currently (at least the version I have here) says:
>
> I daresay there is a reasonable explanation in the SVN design history of
> why this is so (can anybody point me at this?), and I'm aware we can't
> change it now anyway. But I don't think that saying there's 'nothing
> illogical' about it is completely fair.
First off, the N-1 issue is a bit overblown, in that it only applies to
one type of merge -- the type when you are merging one or more specific
patches from one branch/trunk to the other. When you are merging all of
the changes on a branch back to trunk, you just specify the revision the
branch was created as the From, and HEAD as the to. When you are keeping
a branch up to date with trunk, you look at the branch comments to see the
last revision you merged. You then specify that revision as the From, and
either HEAD or the revision number for HEAD as the To. I think these two
types of merges are much easier to understand and execute. As for the
original case, this is how the docs explain it:
http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.2.2
The issue is that with merge you are giving Subversion the parameters to
perform a diff, and the results of that diff are then applied to your WC.
To produce a diff for the change at revision N, you would specify svn diff
N-1:N.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jan 25 15:56:06 2005