# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: john@arbash-meinel.com-20071101195357-0wal0m1h8822rzik
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: 3c976c2d0b21b06966c223c9b7d0d0f59e7eb247
# timestamp: 2007-11-01 14:55:00 -0500
# source_branch: http://bzr.arbash-meinel.com/branches/bzr/0.93-\
#   dev/uncommit_no_history
# base_revision_id: pqm@pqm.ubuntu.com-20071029050400-j2jmz8smj2yecfrr
# 
# Begin patch
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2007-10-22 01:23:51 +0000
+++ bzrlib/builtins.py	2007-11-01 19:53:57 +0000
@@ -3523,7 +3523,7 @@
 
         if revno <= b.revno():
             rev_id = b.get_rev_id(revno)
-        if rev_id is None:
+        if _mod_revision.is_null(rev_id):
             self.outf.write('No revisions to uncommit.\n')
             return 1
 

=== modified file 'bzrlib/tests/blackbox/test_uncommit.py'
--- bzrlib/tests/blackbox/test_uncommit.py	2007-06-26 20:32:49 +0000
+++ bzrlib/tests/blackbox/test_uncommit.py	2007-11-01 19:53:57 +0000
@@ -60,6 +60,12 @@
         out, err = self.run_bzr('status')
         self.assertEquals(out, 'modified:\n  a\n')
 
+    def test_uncommit_no_history(self):
+        wt = self.make_branch_and_tree('tree')
+        out, err = self.run_bzr('uncommit --force', retcode=1)
+        self.assertEqual('', err)
+        self.assertEqual('No revisions to uncommit.\n', out)
+
     def test_uncommit_checkout(self):
         wt = self.create_simple_tree()
         checkout_tree = wt.branch.create_checkout('checkout')

# Begin bundle
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
gIwoZf+LuSKcKEgTBhesAA==