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

Re: 1.4.x branch uses svnmerge.py

From: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: 2006-05-12 19:59:13 CEST

On 5/12/06, Peter N. Lundblad <peter@famlundblad.se> wrote:
> Justin Erenkrantz writes:
> > On 5/11/06, Peter N. Lundblad <peter@famlundblad.se> wrote:
> > > As was suggested some time ago, I've started using svnmerge.py on the 1.4.x
> > > branch. It would be nice if others also use svnmerge.py when back-porting.
> > > Just a quick notice so everyone knows.
> >
> > Do we have a svnmerge.py for dummies guide? -- justin
>
> svnmerge.py help ?

It's not very helpful.

> Basically, I just say
> svnmerge.py merge -r12345,13254
> to merge some revisions.

My limited understanding is that everyone now has to use the svnmerge
tool or otherwise it gets messed up, no? Doesn't it store properties
somewhere? So, I can't use 'svn merge -r12344:12345' without
confusing everyone else, right? -- justin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 12 19:59:39 2006

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