diff options
| author | Han-Wen Nienhuys <hanwen@google.com> | 2007-05-23 16:55:48 -0300 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-05-28 14:29:11 +0200 |
| commit | 7cb5cbefd2c8b4c24bc87c6e30906907f94726ad (patch) | |
| tree | 08b0f673271faeb8db78857469936af3d0c381b5 /contrib/fast-import | |
| parent | cebdf5af319ce638862fe2e2cd2797840962ddbb (diff) | |
| download | git-7cb5cbefd2c8b4c24bc87c6e30906907f94726ad.tar.gz git-7cb5cbefd2c8b4c24bc87c6e30906907f94726ad.tar.xz | |
rename apply() to applyCommit(); apply is a python builtin
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index aba4752d4..bd0ea5492 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/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 |