diff options
| author |  Simon Hausmann <hausmann@kde.org> | 2007-03-16 13:47:46 +0100 |
|---|---|---|
| committer | Simon Hausmann <hausmann@kde.org> | 2007-03-16 13:47:46 +0100 |
| commit | 228d36c92b022ae7941b542731c89db5d9de3eac (patch) | |
| tree | 2551e7a053cde83baca39a75232b1c3015ac06c8 /contrib/fast-import | |
| parent | Use p4 revert ... instead of revert -a ... after submitting, to make sure the... (diff) | |
| download | tgif-228d36c92b022ae7941b542731c89db5d9de3eac.tar.xz | |
Default to interactive syncing
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/p4-git-sync.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/fast-import/p4-git-sync.py b/contrib/fast-import/p4-git-sync.py index e07fcee42c..ed88debd45 100755 --- a/contrib/fast-import/p4-git-sync.py +++ b/contrib/fast-import/p4-git-sync.py @@ -39,7 +39,7 @@ def die(msg): try: opts, args = getopt.getopt(sys.argv[1:], "", [ "continue", "git-dir=", "origin=", "reset", "master=", - "submit-log-subst=", "log-substitutions=", "interactive", + "submit-log-subst=", "log-substitutions=", "noninteractive", "dry-run" ]) except getopt.GetoptError: print "fixme, syntax error" @@ -53,7 +53,7 @@ origin = "origin" master = "" firstTime = True reset = False -interactive = False +interactive = True dryRun = False for o, a in opts: @@ -76,8 +76,8 @@ for o, a in opts: for line in open(a, "r").readlines(): tokens = line[:-1].split("=") logSubstitutions[tokens[0]] = tokens[1] - elif o == "--interactive": - interactive = True + elif o == "--noninteractive": + interactive = False elif o == "--dry-run": dryRun = True |