[SVNMERGE][PATCH] svnmerge rollback

Archie Cobbs archie at dellroad.org
Fri May 19 09:30:21 PDT 2006


Giovanni Bajo wrote:
> - Change "svnmerge init" so that it doesn't record an initial range of 1-REV
> (where REV is the base rev for the branch), but just REV. After this, we can
> always assume that the lowest-numbered revision in the revisionset of
> integrated properties is the revision at which the branch was created (and
> we can forbid it to be rolledback for instance).

This doesn't seem right. It seems like you'd be changing the semantics
of the property. Revisions 1-N have in fact been merged, albeit trivially.

If you just need to avoid an svn call, why not instead record the first
revision "N" explicitly as an additional bit of information.

Either way, you'll need compatibility and upgrade code, but the latter
approach seems cleaner and more consistent.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



More information about the Svnmerge mailing list