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

Re: [Issue 2836] Add ability to block/unblock revisions from merging

From: Blair Zajac <blair_at_orcaware.com>
Date: 2007-07-17 00:34:17 CEST

dlr@tigris.org wrote:
> http://subversion.tigris.org/issues/show_bug.cgi?id=2836
>
>
>
> User dlr changed the following:
>
> What |Old value |New value
> ================================================================================
> Issue type|DEFECT |FEATURE
> --------------------------------------------------------------------------------
> Keywords| |merge-tracking
> --------------------------------------------------------------------------------
> Target milestone|--- |1.6
> --------------------------------------------------------------------------------

Putting the blocking and unblocking feature back to 1.6 doesn't seem like a good
idea. It does seem like a basic feature we would want. Is it that much work to
slip it back to 1.6?

The workaround seems clumsy to me:

"Until this is implemented, the work around is to use 'svn merge --record-only'
to block/unblock revisions from merging, and keep a separate list of revisions
which are to later be considered "blocked". It would be possible to keep such a
list in another Subversion property like "blocked-revisions" to avoid the need
for separate storage."

People are going to modify svnmerge.py to do this :) It would be nice to remove
the need completely for svnmerge.py in 1.5.

Regards,
Blair

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 17 00:33:35 2007

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