Re: Implicit keep-alive after reintegrate merge

I (Julian Foad) wrote:
[....]

> What do we want in this case?  The options are basically:
>
>   (1) try to merge (as we do now), despite knowing it will conflict;
>   (2) skip r11 (not usually good in this kind of case);

Two clarifications:

The options I'm listing are all the options that I think could serve the user well, with different options being best in different circumstances.

As explained on <http://wiki.apache.org/subversion/KeepingReintegratedBranchAlive>, I mean that option (1) should record the revision as merged and (2) not record it.  Neither of those is what my previous patch did; it skipped but recorded, which is great for the simple case but not for the general case.

>   (3) figure out what really "should" be merged and merge it;
>   (4) stop and tell the user what's up.
[...]

- Julian
Received on 2012-01-18 15:33:29 CET