Rev 3243: Fix branch implementation tests for rich-root repository using in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Feb 28 19:54:26 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3243
revision-id:pqm at pqm.ubuntu.com-20080228195416-virz04ciql01hw4y
parent: pqm at pqm.ubuntu.com-20080228181740-9luays3sm3jouxbj
parent: robertc at robertcollins.net-20080228163138-79rgg8thdml9l2zd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-02-28 19:54:16 +0000
message:
Fix branch implementation tests for rich-root repository using
branches (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
------------------------------------------------------------
revno: 3228.2.1.1.3
revision-id:robertc at robertcollins.net-20080228163138-79rgg8thdml9l2zd
parent: robertc at robertcollins.net-20080227022115-cmtkxjtvcp9qjn3r
committer: Robert Collins <robertc at robertcollins.net>
branch nick: fix-branch-subtree-tests
timestamp: Fri 2008-02-29 03:31:38 +1100
message:
NEWS update per review.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3228.2.1.1.2
revision-id:robertc at robertcollins.net-20080227022115-cmtkxjtvcp9qjn3r
parent: robertc at robertcollins.net-20080225013831-0gsynkihg2bk066a
parent: robertc at robertcollins.net-20080227021652-slx6hpps33pf1u61
committer: Robert Collins <robertc at robertcollins.net>
branch nick: fix-branch-subtree-tests
timestamp: Wed 2008-02-27 13:21:15 +1100
message:
Merge bzr.dev.
removed:
index.txt index.txt-20071121073725-0corxykv5irjal00-1
added:
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
tools/package_mf.py package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3228.2.1.1.1
revision-id:robertc at robertcollins.net-20080225013831-0gsynkihg2bk066a
parent: robertc at robertcollins.net-20080222044646-uq0datkkxj96d24d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: fix-branch-subtree-tests
timestamp: Mon 2008-02-25 12:38:31 +1100
message:
* The branch interface tests were invalid for branches using subtree
repositories by default. This has been fixed. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
=== modified file 'NEWS'
--- a/NEWS 2008-02-27 04:14:11 +0000
+++ b/NEWS 2008-02-28 19:54:16 +0000
@@ -60,6 +60,10 @@
TESTING:
+ * The branch interface tests were invalid for branches using rich-root
+ repositories because the empty string is not a valid file-id.
+ (Robert Collins)
+
INTERNALS:
* New module ``tools/package_mf.py`` provide custom module finder for
=== modified file 'bzrlib/tests/branch_implementations/test_commit.py'
--- a/bzrlib/tests/branch_implementations/test_commit.py 2007-09-03 12:32:14 +0000
+++ b/bzrlib/tests/branch_implementations/test_commit.py 2008-02-25 01:38:31 +0000
@@ -123,10 +123,10 @@
def test_pre_commit_passes(self):
empty_delta = TreeDelta()
root_delta = TreeDelta()
- root_delta.added = [('', '', 'directory')]
tree = self.make_branch_and_memory_tree('branch')
tree.lock_write()
- tree.add('', '')
+ tree.add('')
+ root_delta.added = [('', tree.path2id(''), 'directory')]
Branch.hooks.install_hook("pre_commit", self.capture_pre_commit_hook)
revid1 = tree.commit('first revision')
revid2 = tree.commit('second revision')
@@ -140,10 +140,10 @@
def test_pre_commit_fails(self):
empty_delta = TreeDelta()
root_delta = TreeDelta()
- root_delta.added = [('', '', 'directory')]
tree = self.make_branch_and_memory_tree('branch')
tree.lock_write()
- tree.add('', '')
+ tree.add('')
+ root_delta.added = [('', tree.path2id(''), 'directory')]
class PreCommitException(Exception): pass
def hook_func(local, master,
old_revno, old_revid, new_revno, new_revid,
More information about the bazaar-commits
mailing list