Show More
@@ -169,6 +169,9 b' def backout(ui, repo, node=None, rev=Non' | |||||
169 | if not rev: |
|
169 | if not rev: | |
170 | rev = node |
|
170 | rev = node | |
171 |
|
171 | |||
|
172 | if not rev: | |||
|
173 | raise util.Abort(_("please specify a revision to backout")) | |||
|
174 | ||||
172 | cmdutil.bail_if_changed(repo) |
|
175 | cmdutil.bail_if_changed(repo) | |
173 | op1, op2 = repo.dirstate.parents() |
|
176 | op1, op2 = repo.dirstate.parents() | |
174 | if op2 != nullid: |
|
177 | if op2 != nullid: |
@@ -2,9 +2,14 b'' | |||||
2 |
|
2 | |||
3 | HGMERGE=true; export HGMERGE |
|
3 | HGMERGE=true; export HGMERGE | |
4 |
|
4 | |||
5 | echo '# basic operation' |
|
|||
6 | hg init basic |
|
5 | hg init basic | |
7 | cd basic |
|
6 | cd basic | |
|
7 | ||||
|
8 | echo '# should complain' | |||
|
9 | hg backout | |||
|
10 | hg backout -r 0 0 | |||
|
11 | ||||
|
12 | echo '# basic operation' | |||
8 | echo a > a |
|
13 | echo a > a | |
9 | hg commit -d '0 0' -A -m a |
|
14 | hg commit -d '0 0' -A -m a | |
10 | echo b >> a |
|
15 | echo b >> a |
General Comments 0
You need to be logged in to leave comments.
Login now