Mads Kiilerich
9cddfd19ab
check-code: fix check for trailing whitespace on sh command lines
...
The $ has been without necessary escaping since introduced in c4ecbbd282fe.
2012-08-08 18:10:16 +02:00
Mads Kiilerich
fa1c4e5ebe
tests: add missing trailing 'cd ..'
...
Many tests didn't change back from subdirectories at the end of the tests ...
and they don't have to. The missing 'cd ..' could always be added when another
test case is added to the test file.
This change do that tests (99.5%) consistently end up in $TESTDIR where they
started, thus making it simpler to extend them or move them around.
2012-06-11 01:40:51 +02:00
Alain Leufroy
fd923bd6e3
rebase: fix phases movement
...
Rebase now try to keep the phases of source changesets.
2012-01-17 09:12:14 +01:00
Pierre-Yves David
7e4f710bf6
phases: prevent rebase to rebase immutable changeset.
2011-12-27 00:11:22 +01:00
Matt Mackall
66de5cde16
merge: give a special message for internal:merge failure (issue3105)
2011-11-16 18:04:19 -06:00
Patrick Mezard
ee7651120f
Improve unresolved merge conflicts warning (issue2681)
...
Suggested by Antoine Pitrou <pitrou@free.fr>
2011-03-06 15:21:50 +01:00
Steve Borho
6fc11bd3c7
rebase: improve resolve failure message
2010-10-30 16:58:15 -05:00
Mads Kiilerich
3174ff376b
tests: remove redundant globs
...
Many globs now just match $TESTTMP and is no longer needed.
2010-10-08 22:36:10 -05:00
Adrian Buehlmann
1f4e98cf76
tests: unify test-rebase*
2010-10-01 16:10:06 +02:00