Re: [Fwd: Re: merge and properties]

ketil@ii.uib.no (Ketil Z. Malde) writes:

> Philip Martin <philip@codematters.co.uk> writes:
>
> > Be careful... to move changes from one branch to another the
> >
> > svn merge -rREV1:REV URL PATH
> >
> > form is preferred,
>
> I think merging is a subject that deserves a bit more attention. In
> particular, the documentation might be clearer that the above is what
> you usually want (and it is, isn't it?).

I just committed a completely rewritten and expanded chapter on
branching and merging. Take a look at doc/book/book/ch04.xml, see if
it's clearer now.

> I think most merging is going to be either incorporating/reversing a
> single or small set of changes, for which the above is good, or
> incorporating all changes in a branch into the trunk (or another
> branch). Could there be a default action for this (without the need
> to check revsion numbers etc)?

Not until Subversion starts automatically tracking merge information.
See the "repeated merge" sidebar in ch04.xml.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 25 13:57:24 2002