Junio C Hamano <gits...@pobox.com> writes:
> Luke Diamand <l...@diamand.org> writes:
>
>> Sorry - could you resubmit your patch (PATCHv4 it will be) with this
>> change squashed in please? It will make life much easier, especially
>> for Junio!
>
> Thanks for caring, but this seems to be a full patch to replace v3.
>
> It was sent with your Reviewed-by already in, but I'd tentatively
> remove that line while queuing it to 'pu' and ask you to double
> check if the patch makes sense (and after your "yes, it does", I'd
> add the Reviewed-by back).
>
> Thanks.
Just to make it easier to see, the interdiff between v3 and v4 looks
like this:
git-p4.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 1fba3aa..e28033f 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2608,7 +2608,7 @@ class P4Sync(Command, P4UserMap):
return ""
- def importNewBranch(self, branch, maxChange, changes_block_size):
+ def importNewBranch(self, branch, maxChange):
# make fast-import flush all changes to disk and update the refs using
the checkpoint
# command so that we can try to find the branch parent in the git
history
self.gitStream.write("checkpoint\n\n");
@@ -2616,7 +2616,7 @@ class P4Sync(Command, P4UserMap):
branchPrefix = self.depotPaths[0] + branch + "/"
range = "@1,%s" % maxChange
#print "prefix" + branchPrefix
- changes = p4ChangesForPaths([branchPrefix], range, changes_block_size)
+ changes = p4ChangesForPaths([branchPrefix], range,
self.changes_block_size)
if len(changes) <= 0:
return False
firstChange = changes[0]
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
