At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3764
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Sun 2008-10-05 21:18:27 +0100
message:
(Benjamin Peterson) Two small corrections for _dirstate_helpers_c.pyx
modified:
bzrlib/_dirstate_helpers_c.pyx
dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 3763.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Benjamin Peterson <[EMAIL PROTECTED]>
branch nick: logic-bugs
timestamp: Sat 2008-10-04 12:01:00 -0500
message:
fix two small oversights
modified:
bzrlib/_dirstate_helpers_c.pyx
dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
=== modified file 'bzrlib/_dirstate_helpers_c.pyx'
--- a/bzrlib/_dirstate_helpers_c.pyx 2008-09-26 05:47:03 +0000
+++ b/bzrlib/_dirstate_helpers_c.pyx 2008-10-04 17:01:00 +0000
@@ -24,6 +24,7 @@
import errno
import os
import stat
+import sys
from bzrlib import cache_utf8, errors, osutils
from bzrlib.dirstate import DirState
@@ -1070,7 +1071,8 @@
target_minikind = _minikind_from_string(target_details[0])
if path_info is not None and _versioned_minikind(target_minikind):
if self.target_index != 0:
- raise AssertionError("Unsupported target index %d" %
target_index)
+ raise AssertionError("Unsupported target index %d" %
+ self.target_index)
link_or_sha1 = _update_entry(self.state, entry, path_info[4],
path_info[3])
# The entry may have been modified by update_entry
target_details = details_list[self.target_index]
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
