summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 329afb8)
raw | patch | inline | side by side (parent: 329afb8)
author | Pete Wyckoff <pw@padd.com> | |
Wed, 11 Jan 2012 23:31:08 +0000 (18:31 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 12 Jan 2012 00:35:38 +0000 (16:35 -0800) |
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/fast-import/git-p4 | patch | blob | history |
index e267f3115d8661a7fa631be67117a411f544208d..e11e15bad0ca6c552ffe9093af71afebe6e4323d 100755 (executable)
else:
# This mapping matched; no need to search any further.
# But, the mapping could be rejected if the client path
- # has already been claimed by an earlier mapping.
+ # has already been claimed by an earlier mapping (i.e.
+ # one later in the list, which we are walking backwards).
already_mapped_in_client = False
for f in paths_filled:
# this is View.Path.match