------------------------------------------------------------
revno: 2060
revision-id: pqm at pqm.ubuntu.com-20061004050807-10e3417a77ab9943
parent: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
parent: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 06:08:07 +0100
message:
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,...
modified:
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
------------------------------------------------------------
merged: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
parent: robertc at robertcollins.net-20061004043457-571e07d2928d75cb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Wed 2006-10-04 14:50:23 +1000
message:
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,...
------------------------------------------------------------
merged: robertc at robertcollins.net-20061004043457-571e07d2928d75cb
parent: robertc at robertcollins.net-20060928225620-dcf173e716983f3b
parent: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Wed 2006-10-04 14:34:57 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928225620-dcf173e716983f3b
parent: robertc at robertcollins.net-20060928215422-515439591d95933b
parent: robertc at robertcollins.net-20060928223654-9edbbe94712f8ce9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Fri 2006-09-29 08:56:20 +1000
message:
Merge fixed TestCaseWithMemoryTransport.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928215422-515439591d95933b
parent: robertc at robertcollins.net-20060918053858-d84532cfbf59d787
parent: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Fri 2006-09-29 07:54:22 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918053858-d84532cfbf59d787
parent: robertc at robertcollins.net-20060918044531-ee0dbf8d92cfd0c3
parent: robertc at robertcollins.net-20060918053544-531ddf7fd2ae877b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Mon 2006-09-18 15:38:58 +1000
message:
Merge from TestCaseWithMemoryTransport.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918044531-ee0dbf8d92cfd0c3
parent: robertc at robertcollins.net-20060914035209-152ab9b4b2941339
parent: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Mon 2006-09-18 14:45:31 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060914035209-152ab9b4b2941339
parent: robertc at robertcollins.net-20060914032812-af89ea18325d0b7f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Thu 2006-09-14 13:52:09 +1000
message:
25/home/robertc/source/baz/test-performance/bzrlib/tests/test_ancestry.py performance win for tests in test_ancestry.py.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060914032812-af89ea18325d0b7f
parent: robertc at robertcollins.net-20060907233640-ffbf5a907fd6ba31
parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Thu 2006-09-14 13:28:12 +1000
message:
Merge MemoryTree branch.