On Thursday 04 April 2002 13:32, Ben Collins-Sussman wrote:
> merge: apply the differences between two paths to a working copy path.
> usage: svn merge PATH1[@N] PATH2[@M] [WCPATH]
>
> * PATH1 and PATH2 are either working-copy paths or URLs, specified at
> revisions N and M. These are the two sources to be compared.
> * WCPATH is the working-copy path that will receive the changes.
>
> - If either N or M are omitted, HEAD revision is assumed.
> - If WCPATH is omitted, a value of "." is assumed.
> - If PATH1 and PATH2 are identical, an alternate syntax is allowed:
> svn merge -rN:M PATH WCPATH
> -------------------------------------------------------------------------
>
As an early adopter patiently waiting for merge functionality, I would like
to say that I would be more than happy if it were implemented as proposed
here. It's simple enough to be both flexible and clear. It also appears to
cover all of the use-cases that I personally would use. I would much prefer
this to the original merge interface proposed a couple of days ago.
About remembering the original revision of the branch, for now I have adopted
the convention of naming all my branches with "_rXXX" at the end of the
folder name. For example:
/module/branch/descriptive_branch_name_r235
where "235" is the rev number at the time the branch was created. This works
for me now, and I could live without the automation for the time being.
On a side note, I'd just like to say that (despite all the obvious warnings
and implications), I have successfully been using SVN on my commercial
project for a couple months now. Even in its unfinished state, it kicks the
ass out of CVS, especially since this is a new project and I have had to
restructure directories and names more than a few times. SVN's ability to
track directories is really the #1 feature that drove me to switch from CVS.
So far I have managed to any corruption of my repository :-> Great job,
and I am really looking forward to seeing what cool stuff you'll think of
next!
--
Peter Davis
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 5 00:42:50 2002