@matheusbsbs / matheus-bagliano / commits / 66a2f52395
Fork 0

Catch p4 errors in rollback early enough (before deleting refs!)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Simon Hausmann committed May 23, 2007 at 23:40 UTC 66a2f523958129e9b697d30ed44a5174010cb42a
1 file changed +3
contrib/fast-import/git-p4
+3
@@ -152,6 +152,9 @@ class P4RollBack(Command):
152 return False
153 maxChange = int(args[0])
154
155 + if "p4ExitCode" in p4Cmd("p4 changes -m 1"):
156 + die("Problems executing p4");
157 +
158 if self.rollbackLocalBranches:
159 refPrefix = "refs/heads/"
160 lines = mypopen("git rev-parse --symbolic --branches").readlines()