Merge 0.4.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 28 Jul 2008 23:05:38 +0000 (01:05 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 28 Jul 2008 23:05:38 +0000 (01:05 +0200)
1  2 
commit.py
errors.py
repository.py
tests/test_commit.py
workingtree.py

diff --cc commit.py
Simple merge
diff --cc errors.py
Simple merge
diff --cc repository.py
@@@ -19,8 -19,7 +19,7 @@@ import bzrli
  from bzrlib import osutils, ui, urlutils, xml7
  from bzrlib.branch import Branch, BranchCheckResult
  from bzrlib.errors import (InvalidRevisionId, NoSuchRevision, NotBranchError, 
-                            UninitializableFormat, UnrelatedBranches, 
-                            NotWriteLocked)
 -                           UninitializableFormat)
++                           UninitializableFormat, NotWriteLocked)
  from bzrlib.graph import CachingParentsProvider
  from bzrlib.inventory import Inventory
  from bzrlib.lockable_files import LockableFiles, TransportLock
Simple merge
diff --cc workingtree.py
Simple merge