##// END OF EJS Templates
rebase: rewrite "x in y.children()" as "y in x.parents()"...
Martin von Zweigbergk -
r32900:07d5a503 default
parent child Browse files
Show More
@@ -1265,7 +1265,7 def buildstate(repo, dest, rebaseset, co
1265 samebranch = root.branch() == wctx.branch()
1265 samebranch = root.branch() == wctx.branch()
1266 else:
1266 else:
1267 samebranch = root.branch() == dest.branch()
1267 samebranch = root.branch() == dest.branch()
1268 if not collapse and samebranch and root in dest.children():
1268 if not collapse and samebranch and dest in root.parents():
1269 # mark the revision as done by setting its new revision
1269 # mark the revision as done by setting its new revision
1270 # equal to its old (current) revisions
1270 # equal to its old (current) revisions
1271 state[root.rev()] = root.rev()
1271 state[root.rev()] = root.rev()
General Comments 0
You need to be logged in to leave comments. Login now