Show More
@@ -594,7 +594,7 b' def between(repo, old, new, keep):' | |||||
594 | ctxs = list(repo.set('%n::%n', old, new)) |
|
594 | ctxs = list(repo.set('%n::%n', old, new)) | |
595 | if ctxs and not keep: |
|
595 | if ctxs and not keep: | |
596 | if (not obsolete._enabled and |
|
596 | if (not obsolete._enabled and | |
597 |
repo.revs('(%ld::) - (%ld |
|
597 | repo.revs('(%ld::) - (%ld)', ctxs, ctxs)): | |
598 | raise util.Abort(_('cannot edit history that would orphan nodes')) |
|
598 | raise util.Abort(_('cannot edit history that would orphan nodes')) | |
599 | root = ctxs[0] # list is already sorted by repo.set |
|
599 | root = ctxs[0] # list is already sorted by repo.set | |
600 | if not root.phase(): |
|
600 | if not root.phase(): |
General Comments 0
You need to be logged in to leave comments.
Login now