Mercurial > hg
view tests/test-issue619.t @ 14755:6ba51c81ff75 stable
revert: improve hints on abort when reverting to parent without --all
BEFORE:
$ hg revert
abort: no files or directories specified
(use --all to discard all changes)
AFTER:
Uncommitted changes (using --all *will* nuke edits):
$ hg revert
abort: no files or directories specified
(uncommitted changes, use --all to discard all changes)
Clean working directory (using --all won't discard anything):
$ hg revert
abort: no files or directories specified
(use --all to revert all files)
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Sun, 26 Jun 2011 01:13:30 +0200 |
parents | 1792b8a9422b |
children | 41885892796e |
line wrap: on
line source
http://mercurial.selenic.com/bts/issue619 $ hg init $ echo a > a $ hg ci -Ama adding a $ echo b > b $ hg branch b marked working directory as branch b $ hg ci -Amb adding b $ hg co -C 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Fast-forward: $ hg merge b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -Ammerge Bogus fast-forward should fail: $ hg merge b abort: merging with a working directory ancestor has no effect [255]