equal
deleted
inserted
replaced
1319 assert obs.obsolete() |
1319 assert obs.obsolete() |
1320 newer = obsolete.successorssets(repo, obs.node()) |
1320 newer = obsolete.successorssets(repo, obs.node()) |
1321 # search of a parent which is not killed |
1321 # search of a parent which is not killed |
1322 while not newer or newer == [()]: |
1322 while not newer or newer == [()]: |
1323 ui.debug("stabilize target %s is plain dead," |
1323 ui.debug("stabilize target %s is plain dead," |
1324 " trying to stabilize on its parent") |
1324 " trying to stabilize on its parent" % |
|
1325 obs) |
1325 obs = obs.parents()[0] |
1326 obs = obs.parents()[0] |
1326 newer = obsolete.successorssets(repo, obs.node()) |
1327 newer = obsolete.successorssets(repo, obs.node()) |
1327 if len(newer) > 1: |
1328 if len(newer) > 1: |
1328 raise util.Abort(_("conflict rewriting. can't choose destination\n")) |
1329 raise util.Abort(_("conflict rewriting. can't choose destination\n")) |
1329 targets = newer[0] |
1330 targets = newer[0] |