##// END OF EJS Templates
rebase: clear updatestate during rebase --abort in more cases...
Durham Goode -
r31222:56d3e0b4 default
parent child Browse files
Show More
@@ -1156,8 +1156,11 b' def abort(repo, originalwd, target, stat'
1156 1156 if rebased:
1157 1157 strippoints = [
1158 1158 c.node() for c in repo.set('roots(%ld)', rebased)]
1159 shouldupdate = len([
1160 c.node() for c in repo.set('. & (%ld)', rebased)]) > 0
1159
1160 updateifonnodes = set(rebased)
1161 updateifonnodes.add(target)
1162 updateifonnodes.add(originalwd)
1163 shouldupdate = repo['.'].rev() in updateifonnodes
1161 1164
1162 1165 # Update away from the rebase if necessary
1163 1166 if shouldupdate or needupdate(repo, state):
General Comments 0
You need to be logged in to leave comments. Login now