Re: Effects of merge on added files

Eric Sammer <eric@ineoconcepts.com> writes:

> C. Michael Pilato wrote:
> > You want:
> > svn merge ./@HEAD ../dev_0_01@HEAD
>
> I can honestly say that I would have NEVER guessed this was it. To be
> honest, I find the merge syntax quite a bit convoluted. I'm sure this
> is merely a product of alpha status, but maybe something that requires
> a second glance.
>
> Either way, thanks for the info (and it does work with this syntax).

Well, the syntax is pretty straightforward in the general case. It's
like diff, where you have a "from" and a "to", only it also has a
third argument for where to apply that diff. But we do have some
shortcuts to that cmdline that, to be honest, I'm never quite sure how
to use.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Oct 11 15:24:19 2003