diff options
| author |  Simon Hausmann <hausmann@kde.org> | 2007-03-15 19:07:06 +0100 |
|---|---|---|
| committer | Simon Hausmann <hausmann@kde.org> | 2007-03-15 19:07:06 +0100 |
| commit | f72537f97e81398b597c05f12c112c52e8201b63 (patch) | |
| tree | d173cbb2eef3ac714ef4e9ef707f5b41a882feae | |
| parent | Auto-detect the current git branch before submitting back to perforce. (diff) | |
| download | tgif-f72537f97e81398b597c05f12c112c52e8201b63.tar.xz | |
Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
| -rwxr-xr-x | contrib/fast-import/p4-git-sync.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/fast-import/p4-git-sync.py b/contrib/fast-import/p4-git-sync.py index 4f02079895..e07fcee42c 100755 --- a/contrib/fast-import/p4-git-sync.py +++ b/contrib/fast-import/p4-git-sync.py @@ -276,8 +276,8 @@ if len(commits) == 0: print "Deleting temporary p4-sync branch and going back to %s" % master system("git checkout %s" % master) system("git branch -D p4-sync") - print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert -a ..." - system("p4 edit ...") - system("p4 revert -a ...") + print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..." + system("p4 edit ... >/dev/null") + system("p4 revert ... >/dev/null") os.remove(configFile) |