[Svnmerge] svnmerge forget?

[Dale R. Worley]

On Fri, 2005-09-23 at 08:48 -0500, Archie Cobbs wrote:
> Giovanni Bajo wrote:
> > So I'm proposing something like "svnmerge forget -r478-500" which will
> > basically just add the specified revisions to the integrated revisions.
> > Comments?
> 
> Interesting problem, but I think a better solution would be to
> "block out" instead of "forget" these revisions. That is, store
> them in another property (e.g., "svnmerge-blocked" or somesuch).
> This allows someone else (perhaps someone who disagrees with your
> asessment about what might ever happen in the future) to un-do
> the blocking.

I've wanted the "forget" feature for quite some time as well.

In regard to Archie's proposal, I think it is a good addition but I
would suggest a slightly different implementation:  "svnmerge forget"
would add the specified revisions to the usual "revs" variable (so they
would no longer be available for merging), and also add it to a new
"forgotten" variable, to remember that they were forgotten rather than
merged.  This has the advantage of being upward-compatible for any tool
that wants to determine the list of mergable revs.

Dale