Re: [Fwd: Re: merge and properties]

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 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)?

Additionally, the svn merge command should perhaps also be more
careful in what it allows, perhaps asking for confirmation for the
rarer cases?

-kzm

-- 
If I haven't seen further, it is by standing in the footprints of giants
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org