6 Commits

Author	SHA1	Message	Date
Mads Kiilerich	b420dd92b1	spelling: fixes from proofreading of spell checker issues	2014-04-17 22:47:38 +02:00
Martin von Zweigbergk	c830d8dc9d	merge: add more thorough tests for --force ... With generate-working-copy-states.py generalized to support arbitrarily many changesets, we can use it for generating test cases for merge: use one changeset each for base, remote and local. With the various working copy states, this is a total of 104 cases. The first candidate for additional testing is 'hg merge --force'. Even though the force option is deprecated, it is convenient for testing because it can be tested without first needing to revert any changes. Except for the lack of checking for uncommitted changes, it differs in only a few cases from unforced merge. The new tests cover all the cases in the existing test-merge-force.t, except for the unforced merge case, which is covered in several other files anyway, so nothing remains of the file after this patch.	2014-11-26 11:45:21 -08:00
Siddharth Agarwal	88c86521eb	merge: standardize error message for dirty working dir	2013-09-23 20:50:51 -07: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
Matt Mackall	08439e0f2d	tests: add exit codes to unified tests	2010-09-16 17:51:32 -05:00
Adrian Buehlmann	010ea362c8	tests: unify test-merge-force	2010-09-11 17:58:37 +02:00