Rev 1819: (jelmer) fix pending-merge exception checking in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Jun 28 15:06:51 BST 2006
------------------------------------------------------------
revno: 1819
revision-id: pqm at pqm.ubuntu.com-20060628140650-135f9ed05d63075c
parent: pqm at pqm.ubuntu.com-20060628135730-69c51a8debcc73f7
parent: john at arbash-meinel.com-20060628135843-f5edb57ece84fea5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-06-28 15:06:50 +0100
message:
(jelmer) fix pending-merge exception checking
modified:
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: john at arbash-meinel.com-20060628135843-f5edb57ece84fea5
parent: john at arbash-meinel.com-20060628134735-84eb08db9be11e00
parent: jelmer at samba.org-20060627084732-3c3fdc02e5bea94e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-06-28 08:58:43 -0500
message:
[merge] Jelmer Vernooij: fix pending-merge exception checking
------------------------------------------------------------
merged: jelmer at samba.org-20060627084732-3c3fdc02e5bea94e
parent: jelmer at samba.org-20060627005214-ada07acfa15484b7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-06-27 10:47:32 +0200
message:
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
------------------------------------------------------------
merged: jelmer at samba.org-20060627005214-ada07acfa15484b7
parent: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-06-27 02:52:14 +0200
message:
Catch right exception to detect pending-merges file is missing.
More information about the bazaar-commits
mailing list