equal
deleted
inserted
replaced
276 # or to another rebased revision, it must have been |
276 # or to another rebased revision, it must have been |
277 # removed. |
277 # removed. |
278 targetrev = repo[repo._rebasetarget].rev() |
278 targetrev = repo[repo._rebasetarget].rev() |
279 newrevs = set([targetrev]) |
279 newrevs = set([targetrev]) |
280 for rev, newrev in sorted(repo._rebasestate.items()): |
280 for rev, newrev in sorted(repo._rebasestate.items()): |
|
281 if newrev == -2: # nullmerge |
|
282 continue |
281 oldnode = repo[rev].node() |
283 oldnode = repo[rev].node() |
282 if newrev not in newrevs and newrev >= 0: |
284 if newrev not in newrevs and newrev >= 0: |
283 newnode = repo[newrev].node() |
285 newnode = repo[newrev].node() |
284 newrevs.add(newrev) |
286 newrevs.add(newrev) |
285 else: |
287 else: |