Show More
@@ -1356,11 +1356,12 b' def between(repo, old, new, keep):' | |||
|
1356 | 1356 | When keep is false, the specified set can't have children.""" |
|
1357 | 1357 | ctxs = list(repo.set('%n::%n', old, new)) |
|
1358 | 1358 | if ctxs and not keep: |
|
1359 | revs = [ctx.rev() for ctx in ctxs] | |
|
1359 | 1360 | if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and |
|
1360 |
repo.revs('(%ld::) - (%ld)', |
|
|
1361 | repo.revs('(%ld::) - (%ld)', revs, revs)): | |
|
1361 | 1362 | raise error.Abort(_('can only histedit a changeset together ' |
|
1362 | 1363 | 'with all its descendants')) |
|
1363 |
if repo.revs('(%ld) and merge()', |
|
|
1364 | if repo.revs('(%ld) and merge()', revs): | |
|
1364 | 1365 | raise error.Abort(_('cannot edit history that contains merges')) |
|
1365 | 1366 | root = ctxs[0] # list is already sorted by repo.set |
|
1366 | 1367 | if not root.mutable(): |
General Comments 0
You need to be logged in to leave comments.
Login now