Commit Graph

13 Commits

Author SHA1 Message Date
Matt Mackall
4412e65957 backout: disallow across branches (issue655) 2007-12-01 13:09:27 -06:00
Thomas Arendsen Hein
5b3cfe2be9 Fix and test 'hg backout' without or with too many revisions. 2007-06-26 15:28:17 +02:00
Matt Mackall
469dca271e backout: report short hash in commit message 2007-06-25 12:44:48 -05:00
Alexis S. L. Carvalho
b53e6f3897 change locate to use relglobs by default
This makes its default behaviour useful again (issue108), and
changes it search the entire repository by default (instead
of just the cwd), just like all other commands.

It also hides issue204 by default, but you'll still see the
same behaviour if you give it a relpath: pattern.
2007-03-10 23:00:57 -03:00
Vadim Gelfer
45763df4fc tests: fix output for test-backout 2006-08-02 13:04:36 -07:00
Vadim Gelfer
a5035ce98c update test-backout.out 2006-07-15 09:19:40 -07:00
Vadim Gelfer
b283318ce4 print message after backout that tells that backout adds new head. 2006-06-23 17:33:10 -07:00
Brendan Cully
15cb23906a Test case for #295 2006-06-23 17:21:04 -07:00
Vadim Gelfer
aa92622634 revert: better fix for not printing 'reverting' message 2006-06-07 13:16:25 -07:00
Thomas Arendsen Hein
730a790e89 Corrected tests for commit now consistently stripping last newline. 2006-05-17 19:59:15 +02:00
Vadim Gelfer
5c38728103 fix coding style of backout editor change. 2006-05-11 14:41:52 -07:00
Thomas Arendsen Hein
46d0753ec7 Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
 with the exception of backout --merge)

Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved

Inform the user what to do after a merge:
(branch merge, don't forget to commit)

Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
  hg update -C X
  hg merge Y

Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
2006-05-02 18:44:02 +02:00
Vadim Gelfer
1975d41da8 add backout command.
command undoes effect of an earlier commit, commits new changeset
as result.
2006-04-29 20:56:46 -07:00