[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: Daniel Rall <dlr_at_collab.net>
Date: 2006-05-16 01:16:04 CEST

On Sun, 14 May 2006, Giovanni Bajo wrote:

> Garrett Rooney <rooneg@electricjellyfish.net> wrote:
> >> 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?
> >
> > Correct.
> The only "confusion" would be that svnmerge.py won't know the revision was
> already merged, and thus allow to remerge it if asked to do so.

Yup -- no worse off than we already are.

> And anyway,
> this can be fixed at any time with "svnmerge.py merge --record-only" which
> means "don't merge, but record that it's been done" (or, of course, by
> hand-editing the property).

The former is available only on trunk and 1.4.x, while the latter hack is
available in all versions of svnmerge.py.

Daniel Rall

  • application/pgp-signature attachment: stored
Received on Tue May 16 01:16:27 2006

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