Comment 5 for bug 307662

Am 01/12/11 07:45, schrieb Martin Pool:
> lots of history in
> https://code.launchpad.net/~slyguy/bzr/bzr.strict_append_revisions_only/+merge/18317
> https://code.launchpad.net/~vila/bzr/bzr.strict_append_revisions_only/+merge/23916
>
> They basically ended up just improving the option to be harder to
> accidentally mis-set.
>
> I think doing this change is technically trivial. The only concern is
> whether people will find it disruptive.
>
> One option to put it in is to just tell people: use
> -Oappend_revisions_only=false if you don't like it. We could add a
> specific option for that.
I think if we wanted to make append_revisions_only the default then I
think we should consider fixing bug 605067 "want option to allow
uncommit but disallow changing mainline" first. Speaking for myself,
uncommit is the main reason that I don't use append-revisions-only on my
local branches, and it would be quite annoying to have to unset it every
time I want to uncommit (I use uncommit a lot).

>
> Eventually it would be good to do a merge --into option.
Yeah, that would indeed be a neat option. Perhaps a separate command,
"bzr land" ?

Cheers,

Jelmer