7 Commits

Author	SHA1	Message	Date
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
Mads Kiilerich	717f1ed7d4	tests: drop a couple of unnecessary 'hghave symlink'	2012-06-10 18:50:42 +02:00
Mads Kiilerich	4838bfb2c4	tests: use 'hghave symlink' for tests using symlinks	2011-11-07 03:14:54 +01:00
Nicolas Dumazet	274ada7d8c	tests: move test bundles in a bundles/ subdirectory	2011-04-30 17:38:06 +02:00
Mads Kiilerich	e4660104cf	util: flush stdout before calling external processes ... stdout could have content in its buffer while a subprocess ran and emitted output. Flushing stdout ensures that output now comes in the right order.	2011-02-18 03:35:01 +01:00
Steve Borho	a3baf6a2e7	merge: implement --tool arguments using new ui.forcemerge configurable ... ui.forcemerge is set before calling into merge or resolve commands, then unset to prevent ui pollution for further operations. ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the given --tool is not found by the merge-tools machinery. This makes it possible to do: hg resolve --tool="python mymerge.py" FILE With this approach, HGMERGE and ui.merge are not harmed by --tool	2010-10-19 22:33:52 -05:00
Matt Mackall	3405f1e40a	tests: unify test-merge-symlinks	2010-09-26 13:43:21 -05:00