Catch p4 errors in rollback early enough (before deleting refs!)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>maint
parent
ac3e0d79ee
commit
66a2f52395
|
|
@ -152,6 +152,9 @@ class P4RollBack(Command):
|
||||||
return False
|
return False
|
||||||
maxChange = int(args[0])
|
maxChange = int(args[0])
|
||||||
|
|
||||||
|
if "p4ExitCode" in p4Cmd("p4 changes -m 1"):
|
||||||
|
die("Problems executing p4");
|
||||||
|
|
||||||
if self.rollbackLocalBranches:
|
if self.rollbackLocalBranches:
|
||||||
refPrefix = "refs/heads/"
|
refPrefix = "refs/heads/"
|
||||||
lines = mypopen("git rev-parse --symbolic --branches").readlines()
|
lines = mypopen("git rev-parse --symbolic --branches").readlines()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue