Show More
@@ -5514,7 +5514,7 b' def revert(ui, repo, *pats, **opts):' | |||
|
5514 | 5514 | |
|
5515 | 5515 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
5516 | 5516 | |
|
5517 | if not pats and not opts.get('all'): | |
|
5517 | if not pats and not (opts.get('all') or opts.get('interactive')): | |
|
5518 | 5518 | msg = _("no files or directories specified") |
|
5519 | 5519 | if p2 != nullid: |
|
5520 | 5520 | hint = _("uncommitted merge, use --all to discard all changes," |
@@ -121,6 +121,21 b' 10 run the same test than 8 from within ' | |||
|
121 | 121 | 4 |
|
122 | 122 | 5 |
|
123 | 123 | f |
|
124 | ||
|
125 | Test that --interactive lift the need for --all | |
|
126 | ||
|
127 | $ echo q | hg revert -i -r 2 | |
|
128 | reverting folder1/g (glob) | |
|
129 | reverting folder2/h (glob) | |
|
130 | diff -r 89ac3d72e4a4 folder1/g | |
|
131 | 1 hunks, 1 lines changed | |
|
132 | examine changes to 'folder1/g'? [Ynesfdaq?] q | |
|
133 | ||
|
134 | abort: user quit | |
|
135 | [255] | |
|
136 | $ rm folder1/g.orig | |
|
137 | ||
|
138 | ||
|
124 | 139 | $ hg update -C 6 |
|
125 | 140 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
126 | 141 | $ hg revert -i -r 2 --all -- << EOF |
General Comments 0
You need to be logged in to leave comments.
Login now