[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Effects of merge on added files

From: Francois Beausoleil <fbos_at_users.sourceforge.net>
Date: 2003-10-11 16:20:39 CEST

On 11 Oct 2003 08:22:59 -0500, "C. Michael Pilato" <cmpilato@collab.net>
said:
> 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.
>

You know what ? I used the /path@X /path@Y syntax only once. And I did
not understand completely. So, I switched to svn merge -r X:Y /path, and
since then, my merges have been working wonderfully ;)

Thanks !
François
Developer of Java Gui Builder
http://jgb.sourceforge.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Oct 11 16:21:34 2003

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.