From: Han-Wen Nienhuys <hanwen@google.com>
Date: Mon, 23 Jul 2007 22:51:49 +0000 (-0700)
Subject: Sort output of "p4 change" in incremental import before further
X-Git-Tag: v1.5.3-rc4~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4eba020f96e1b85f856a992782b8bb2bab6a719;p=thirdparty%2Fgit.git

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>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 1f5a56ee7f..f00c691a7b 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))]