Commit Graph

10 Commits

Author SHA1 Message Date
Martin Geisler
65537ad291 tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
2009-04-26 14:29:02 +02:00
Thomas Arendsen Hein
9db0aea4ab Add test case for backout on named branches (issue665) 2008-02-22 11:28:14 +01:00
Gilles Moris
09841be9f6 Reverse the way backout is doing the merge
Currently, backout is creating a backout revision as a child node of the
backed out node and will leave you at this new head. This has several
drawbacks:
* this changes the current head
* when there is a long history between the backed out node and the
current head, this will generate a huge number of diffs that are scary
at first sight, and not very natural to review before commit.
The change consists to switch back to the original node as soon as the
backout node (which becomes the new tip) has been created. Then the
--merge option can just merge this new tip in the current node.
* the current head/node is not changed from the user's point of view
* even without using the --merge option, the backout revision is still
easy to locate, as this is the tip
* the merge is much more intuitive as diffs of the merge is right you
are looking to backout
2008-02-21 08:52:52 +01:00
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
Alexis S. L. Carvalho
a4fb0722ca change tests to use simplemerge by default 2007-04-16 20:17:39 -03:00
Vadim Gelfer
895f59ec1c backout: allow backout of merge changeset with --parent option.
--parent allows to choose which parent of merge to revert to.
2006-07-14 23:19:15 -07:00
Brendan Cully
15cb23906a Test case for #295 2006-06-23 17:21:04 -07:00
TK Soh
fbc7092173 tests: fix compatibility on Solaris 2006-05-03 11:25:25 +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