From 66a2f523958129e9b697d30ed44a5174010cb42a Mon Sep 17 00:00:00 2001
From: Simon Hausmann <shausman@trolltech.com>
Date: Wed, 23 May 2007 23:40:48 +0200
Subject: [PATCH] Catch p4 errors in rollback early enough (before deleting
 refs!)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
---
 contrib/fast-import/git-p4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 6ae3bc6e5d..6d016b83d4 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -152,6 +152,9 @@ class P4RollBack(Command):
             return False
         maxChange = int(args[0])
 
+        if "p4ExitCode" in p4Cmd("p4 changes -m 1"):
+            die("Problems executing p4");
+
         if self.rollbackLocalBranches:
             refPrefix = "refs/heads/"
             lines = mypopen("git rev-parse --symbolic --branches").readlines()