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

Re: [SVNMERGE][PATCH] svnmerge rollback

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-05-19 19:41:34 CEST

On Fri, 19 May 2006 22:00:21 +0530, Archie Cobbs <archie@dellroad.org>
wrote:

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

I second Giovanni, we need to internally only maintain N-REV as the
svnmerge-integrated property, where N is the branch creation revision.
It will help us intrinsically maintain the revision at which the source
was created without having to query for it everytime.

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

Right, so the display_revision() functions should *understand* N-REV as
1-REV and display hence.
The user always sees 1-REV as the integrated revision range. This would
not change.

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

nah, store N-REV. Why some extra bytes?

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

Giovanni's detect 1-REV style and silently change it to N-REV sounds a
good approach to me.

Regards,
Madan.

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

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