[MERGE] uncommit from empty history

John Arbash Meinel john at arbash-meinel.com
Thu Nov 1 19:55:34 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

It turns out this was an interaction between Branch's returning "null:" rather
than returning None. We actually had a check, but it wasn't triggering.

The attached patch adds a test, and fixes the check to use "is_null(rev_id)"
instead of "rev_id is None".

John
=:->


info wrote:
> On Thursday 01 November 2007 18:42, John Arbash Meinel wrote:
>> info wrote:
>>> Hi
>>>
>>> I just started using bzr on my suse 9.3
>>> I got an error by doing the following:
>>>
>>> a) add file ./myconfig
>>> b) bzr commit
>>> c) change file ./myconfig
>>> d) bzr diff myconfig
>>> e) bzr uncommit
>>>
>>> Error message see below.
>>> Thanks for your help on this.
>>> Mike
>>>
>>>
>>> sah at apus:~/tmp> bzr diff myconfig
>>> === added file 'myconfig'
>>> --- myconfig    1970-01-01 00:00:00 +0000
>>> +++ myconfig    2007-11-01 16:48:49 +0000
>>> @@ -0,0 +1,8 @@
>>> +a
>>> +b
>>> +c
>>> +d
>>> +
>>> +
>>> +last entry
>>> +agin last entry
>> From the looks of it, you didn't actually do the "bzr commit". The above
>> diff is for a newly added file "=== added file 'myconfig'"
>>
>> And while you shouldn't get the traceback, the bug is that "bzr uncommit"
>> with no history is failing. We should instead be giving you a "Nothing to
>> Uncommit" message.
> OK, then it can be explained.
> Thanks very much for your fast response!
> --
> Best regards,
> Mike
> 
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHKi8pJdeBCYSNAAMRApdDAKCZ/XTo+SP8EKokWXZ5HKo0PvLizgCgyIqy
SecROorOIX5Y18OjfiTJT24=
=4o7M
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: uncommit_no_history.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20071101/c0a146d1/attachment.diff 


More information about the bazaar mailing list