9 Commits

Author	SHA1	Message	Date
Jordi Gutiérrez Hermoso	b28181a568	merge: report all files in _checkunknown ... When doing hg up, if there is a file conflict with untracked files, currently only the first such conflict is reported. With this patch, all of them are listed. With this patch error message is now reported as a: untracked file differs b: untracked file differs abort: untracked files in working directory conflict with files in requested revision instead of abort: untracked file in working directory differs from file in requested revision: 'a' This is a follow up to an old attempt to do this here: http://selenic.com/pipermail/mercurial-devel/2011-August/033625.html	2012-01-11 15:53:42 -05:00
Kevin Bullock	4b1f198355	merge: make 'nothing to merge' aborts consistent ... Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.	2011-12-07 11:23:01 -06:00
Mads Kiilerich	6260903881	tests: cleanup of echo statements left over from test conversion	2011-10-13 04:27:49 +02:00
Martin Geisler	5a0135a6ca	tests: remove redundant mkdir ... There are still many tests that check that a bare 'hg init' initializes the current directory.	2011-04-19 12:04:44 +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
Matt Mackall	bc4d4ff1d1	merge: handle no file parent in backwards merge (issue2364)	2010-10-09 14:50:20 -05:00
Matt Mackall	08439e0f2d	tests: add exit codes to unified tests	2010-09-16 17:51:32 -05:00
Martin Geisler	cc612c476f	tests: remove unneeded -d flags ... Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.	2010-09-02 23:22:51 +02:00
Pradeepkumar Gayam	5dff28e667	tests: unify test-merge1	2010-08-18 05:05:51 +05:30