[Svnmerge] svnmerge drops revisions from svnmerge-integrated

Tilmann Singer tils at tils.net
Tue Nov 14 11:57:01 PST 2006


* Daniel Rall <dlr at collab.net> [20061114 18:21]:
> > If it just happened once, it's possibly due to mishandling by the
> > committer... not to blame the victim... of course a bug is always
> > possible, but I haven't heard of any other similar reports.
> 
> I've never heard of this happening either.  Are you using/do you need
> the --bidirectional flag?

No.

> > > Also I would appreciate suggestions how to fix our current value of
> > > svnmerge-integrated. Should I just insert the forgotten revisions in
> > > order, separated by commas? Or would it be necessary to concatenate
> > > consecutive revs into ranges?
> 
> Use 'svnmerge.py merge -rN --record-only' to adjust the merge history
> for a merge source without performing the actual merge.

Thanks. Apparently we were using a version where this option did not
yet exist - unfortunately downloaded directly so the version keyword
was not expanded inside the script.

We will upgrade and see if the dropping of revisions occurs again.


Til



More information about the Svnmerge mailing list