mirror of
https://github.com/frej/fast-export.git
synced 2026-01-23 22:59:02 +01:00
rename apply() to applyCommit(); apply is a python builtin
This commit is contained in:
committed by
Simon Hausmann
parent
bd609cfd0f
commit
e22b86f010
4
git-p4
4
git-p4
@@ -259,7 +259,7 @@ class P4Submit(Command):
|
||||
|
||||
return result
|
||||
|
||||
def apply(self, id):
|
||||
def applyCommit(self, id):
|
||||
if self.directSubmit:
|
||||
print "Applying local change in working directory/index"
|
||||
diff = self.diffStatus
|
||||
@@ -494,7 +494,7 @@ class P4Submit(Command):
|
||||
commit = commits[0]
|
||||
commits = commits[1:]
|
||||
self.config["commits"] = commits
|
||||
self.apply(commit)
|
||||
self.applyCommit(commit)
|
||||
if not self.interactive:
|
||||
break
|
||||
|
||||
|
||||
Reference in New Issue
Block a user