Rev 2344: Fix addition of relocation records when we encounter the correct location first try. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/dirstate/
Robert Collins
robertc at robertcollins.net
Tue Feb 20 20:52:15 GMT 2007
At sftp://bazaar.launchpad.net/%7Ebzr/bzr/dirstate/
------------------------------------------------------------
revno: 2344
revision-id: robertc at robertcollins.net-20070220205121-3xw8a0qe1uql9eeq
parent: robertc at robertcollins.net-20070220200447-pvv3g67iyk2vro42
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 07:51:21 +1100
message:
Fix addition of relocation records when we encounter the correct location first try.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py 2007-02-20 20:04:47 +0000
+++ b/bzrlib/dirstate.py 2007-02-20 20:51:21 +0000
@@ -1341,8 +1341,8 @@
new_entry[1].append(update_details)
else:
# we have the right key, make a pointer to it.
- pointer_path = os.path.join(other_key[0:2])
- new_details.append(('relocated', pointer_path, 0, False, ''))
+ pointer_path = os.path.join(*other_key[0:2])
+ new_entry[1].append(('relocated', pointer_path, 0, False, ''))
block.insert(entry_index, new_entry)
existing_keys.add(key)
else:
More information about the bazaar-commits
mailing list