[PLUGIN] bzr uncommit updated

[John A Meinel]

Martin Pool wrote:
> On 24/09/05, John A Meinel <john at arbash-meinel.com> wrote:
> 
>>I just updated the uncommit plugin, available at:
>>http://bzr.arbash-meinel.com/plugins/bzr-uncommit/
> 
> 
> I think we should make this a builtin feature, if John is satisfied
> with the code.  Maybe Robert could move it into integration.
> 
> --
> Martin
> 
> 

I don't have any tests written yet, but you might look at:
http://bzr.arbash-meinel.com/branches/bzr/with-uncommit/

I'm making an attempt at faking a merge between unrelated trees, 
(forcing it by filling in .bzr/pending-merges).
I'm curious if I'll be able to develop on the plugin branch, and still 
merge the changes into the main branch.

Though I messed up in one revision by using the wrong file-id (I also 
had to set that manually).

I also just found out that doing "bzr merge" sets "pending-merges" even 
if it doesn't change anything. Should it?

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050923/e5c6d6ac/attachment.pgp