Show More
@@ -917,7 +917,7 b' def absorb(ui, repo, stack=None, targetc' | |||||
917 | 'be analysed\n') |
|
917 | 'be analysed\n') | |
918 | % limit) |
|
918 | % limit) | |
919 | if not stack: |
|
919 | if not stack: | |
920 | raise error.Abort(_('no changeset to change')) |
|
920 | raise error.Abort(_('no mutable changeset to change')) | |
921 | if targetctx is None: # default to working copy |
|
921 | if targetctx is None: # default to working copy | |
922 | targetctx = repo[None] |
|
922 | targetctx = repo[None] | |
923 | if pats is None: |
|
923 | if pats is None: |
@@ -18,7 +18,7 b'' | |||||
18 | Do not crash with empty repo: |
|
18 | Do not crash with empty repo: | |
19 |
|
19 | |||
20 | $ hg absorb |
|
20 | $ hg absorb | |
21 | abort: no changeset to change |
|
21 | abort: no mutable changeset to change | |
22 | [255] |
|
22 | [255] | |
23 |
|
23 | |||
24 | Make some commits: |
|
24 | Make some commits: | |
@@ -225,7 +225,7 b' Merge commit will not be changed:' | |||||
225 | $ echo 2 >> m1 |
|
225 | $ echo 2 >> m1 | |
226 | $ echo 2 >> m2 |
|
226 | $ echo 2 >> m2 | |
227 | $ hg absorb |
|
227 | $ hg absorb | |
228 | abort: no changeset to change |
|
228 | abort: no mutable changeset to change | |
229 | [255] |
|
229 | [255] | |
230 | $ hg revert -q -C m1 m2 |
|
230 | $ hg revert -q -C m1 m2 | |
231 |
|
231 |
General Comments 0
You need to be logged in to leave comments.
Login now