[Svnmerge] svnmerge drops revisions from svnmerge-integrated

[Daniel Rall]

On Mon, 13 Nov 2006, Archie Cobbs wrote:

> On 11/13/06, Tilmann Singer <tils at tils.net> wrote:
> > Recently however we observed that revisions that have been previously
> > merged and saved to the svnmerge-integrated property suddenly
> > disappear from the svnmerge-integrated property and thus are being
> > listed again in 'svnmerge avail' output.
> 
> Did this happen just once or has it happened several times?
> 
> 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?

> > 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.


> To fix it, just manually edit the property. svnmerge is tolerant of
> overlapping ranges, duplicates, etc., so you should be able to just
> tack the ones you want to add onto the end.

Huh, I didn't know that.  If you insert the new revisions manually,
svnmerge.py should properly collapse the revision ranges next time you
use it to perform a merge.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20061114/a9391330/attachment-0002.pgp>