Rev 2349: (marienz, r=john, r=mbp) fix error committing merge with symlinks in dirstate in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Mar 13 05:55:17 GMT 2007
------------------------------------------------------------
revno: 2349
revision-id: pqm at pqm.ubuntu.com-20070313055515-823e15af73d49270
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: mbp at sourcefrog.net-20070313025837-ob25gqj83tyemwj2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 05:55:15 +0000
message:
(marienz,r=john,r=mbp) fix error committing merge with symlinks in dirstate
added:
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
merged: mbp at sourcefrog.net-20070313025837-ob25gqj83tyemwj2
parent: mbp at sourcefrog.net-20070313025747-k6ifccbdvba2l12o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mz.symlinks
timestamp: Tue 2007-03-13 13:58:37 +1100
message:
update news
------------------------------------------------------------
merged: mbp at sourcefrog.net-20070313025747-k6ifccbdvba2l12o
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: marienz at gentoo.org-20070312205523-gl34xzw1eg0ji28x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mz.symlinks
timestamp: Tue 2007-03-13 13:57:47 +1100
message:
(marienz) fixes for error committing merge with symlinks in dirstate
------------------------------------------------------------
merged: marienz at gentoo.org-20070312205523-gl34xzw1eg0ji28x
parent: marienz at gentoo.org-20070312033112-q8h6b0wwzc7ew4d8
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 21:55:23 +0100
message:
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests.
------------------------------------------------------------
merged: marienz at gentoo.org-20070312033112-q8h6b0wwzc7ew4d8
parent: marienz at gentoo.org-20070312033007-47ci7w0fehb5gqq2
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 04:31:12 +0100
message:
More tests for symlinks in tree inventories.
------------------------------------------------------------
merged: marienz at gentoo.org-20070312033007-47ci7w0fehb5gqq2
parent: marienz at gentoo.org-20070312023543-2ue1egax0wbvl87s
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 04:30:07 +0100
message:
Fix a bug in selftest causing tearDown to run twice for skipped tests.
------------------------------------------------------------
merged: marienz at gentoo.org-20070312023543-2ue1egax0wbvl87s
parent: marienz at gentoo.org-20070312023523-h4bhx3oyqmbd27tf
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 03:35:43 +0100
message:
Remove dead code.
------------------------------------------------------------
merged: marienz at gentoo.org-20070312023523-h4bhx3oyqmbd27tf
parent: marienz at gentoo.org-20070312010216-j6u0y6v75nk071me
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 03:35:23 +0100
message:
Move some tests that do not need a working tree from workingtree_implementations to tree_implementations.
------------------------------------------------------------
merged: marienz at gentoo.org-20070312010216-j6u0y6v75nk071me
parent: marienz at gentoo.org-20070312003752-luxbjn7ty2mr3pyj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 02:02:16 +0100
message:
Make an assert actually assert something.
------------------------------------------------------------
merged: marienz at gentoo.org-20070312003752-luxbjn7ty2mr3pyj
parent: marienz at gentoo.org-20070311232335-wpymm3pagwdtasjn
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 01:37:52 +0100
message:
Increase test coverage.
------------------------------------------------------------
merged: marienz at gentoo.org-20070311232335-wpymm3pagwdtasjn
parent: marienz at gentoo.org-20070311230549-rn7jh354jrzq6m1e
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 00:23:35 +0100
message:
Make the workingtree inventory tests actually use the different workingtree implementations.
------------------------------------------------------------
merged: marienz at gentoo.org-20070311230549-rn7jh354jrzq6m1e
parent: marienz at gentoo.org-20070311221559-mvb05lew4yyogh5y
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 00:05:49 +0100
message:
Move the workingtree-related inventory tests to a separate file.
------------------------------------------------------------
merged: marienz at gentoo.org-20070311221559-mvb05lew4yyogh5y
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Sun 2007-03-11 23:15:59 +0100
message:
Fix committing merges in a dirstate tree with a symlink.
More information about the bazaar-commits
mailing list