reverse merge....

[Matthieu Moy]

"Erik Bågfors" <zindar at gmail.com> writes:

>> Indeed, a swiss-army-knife would be
>> "bzr convert-commits-to-pending-merge -r ...". It could be funny to
>> have it also (but certainly not in the core, no need to bother the
>> normal user with one more command).
>
> Just figured out that "convert-commits-to-pending-merge -r foo" can be
> implemented with
> REV=$(bzr revision-history | tail -1)
> bzr uncommit -r foo --force
> echo $REV > .bzr/branch/pending-merge
>
> So, that's real easy to implement...

That's indeed a small piece of code in workingtree.update(), yes.

Indeed, perhaps it should be implemented in core as
"bzr uncommit --keep-pending". Just an idea, probably not good ;-).

-- 
Matthieu