summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@google.com>2007-07-23 22:51:49 (GMT)
committerSimon Hausmann <simon@lst.de>2007-08-02 07:40:25 (GMT)
commita4eba020f96e1b85f856a992782b8bb2bab6a719 (patch)
treeab8524591c0e6e46733ac7dcb0ccdc80f7655ca7
parent68d4229847b0f94982b4f2f58ce5e9cbd0f6f8fc (diff)
downloadgit-a4eba020f96e1b85f856a992782b8bb2bab6a719.zip
git-a4eba020f96e1b85f856a992782b8bb2bab6a719.tar.gz
git-a4eba020f96e1b85f856a992782b8bb2bab6a719.tar.bz2
Sort output of "p4 change" in incremental import before further
processing P4 change outputs the changes sorted for each directory separately. We want the global ordering on the changes, hence we sort. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Simon Hausmann <simon@lst.de>
-rwxr-xr-xcontrib/fast-import/git-p42
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 1f5a56e..f00c691 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1296,7 +1296,7 @@ class P4Sync(Command):
changeNum = line.split(" ")[1]
changes.append(changeNum)
- changes.reverse()
+ changes.sort()
if len(self.maxChanges) > 0:
changes = changes[0:min(int(self.maxChanges), len(changes))]