Rev 6442: (vila) Test for equality instead of object identity where ROOT_PARENT in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/
Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jan 17 16:32:49 UTC 2012
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/
------------------------------------------------------------
revno: 6442 [merge]
revision-id: pqm at pqm.ubuntu.com-20120117163248-ww279fz60goz4rwo
parent: pqm at pqm.ubuntu.com-20120117105838-0mxygbn81uh5p629
parent: v.ladeuil+lp at free.fr-20120117160307-0ufsytdtj5l3rrzr
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Tue 2012-01-17 16:32:48 +0000
message:
(vila) Test for equality instead of object identity where ROOT_PARENT
is concerned. (Wouter van Heyst)
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2011-12-19 17:39:35 +0000
+++ b/bzrlib/transform.py 2012-01-17 14:45:27 +0000
@@ -230,7 +230,7 @@
irrelevant.
"""
- new_roots = [k for k, v in self._new_parent.iteritems() if v is
+ new_roots = [k for k, v in self._new_parent.iteritems() if v ==
ROOT_PARENT]
if len(new_roots) < 1:
return
@@ -626,7 +626,7 @@
for trans_id in self._new_parent:
seen = set()
parent_id = trans_id
- while parent_id is not ROOT_PARENT:
+ while parent_id != ROOT_PARENT:
seen.add(parent_id)
try:
parent_id = self.final_parent(parent_id)
@@ -642,7 +642,7 @@
"""If parent directories are versioned, children must be versioned."""
conflicts = []
for parent_id, children in by_parent.iteritems():
- if parent_id is ROOT_PARENT:
+ if parent_id == ROOT_PARENT:
continue
if self.final_file_id(parent_id) is not None:
continue
@@ -741,7 +741,7 @@
"""Children must have a directory parent"""
conflicts = []
for parent_id, children in by_parent.iteritems():
- if parent_id is ROOT_PARENT:
+ if parent_id == ROOT_PARENT:
continue
no_children = True
for child_id in children:
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt 2012-01-16 17:24:42 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt 2012-01-17 16:02:03 +0000
@@ -32,6 +32,9 @@
.. Fixes for situations where bzr would previously crash or give incorrect
or undesirable results.
+* Test for equality instead of object identity where ROOT_PARENT is concerned.
+ (Wouter van Heyst, #881142)
+
Documentation
*************
More information about the bazaar-commits
mailing list