Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 12279:28e2e3804f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
combine tests
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 14 Sep 2010 12:20:51 +0200
parents ad787252fed6
children 6f0d9d79111f
comparison
equal deleted inserted replaced
12278:c4c2ba553401 12279:28e2e3804f2e
431 given the -c and -C or no options, whether the working directory 431 given the -c and -C or no options, whether the working directory
432 is dirty, whether a revision is specified, and the relationship of 432 is dirty, whether a revision is specified, and the relationship of
433 the parent rev to the target rev (linear, on the same named 433 the parent rev to the target rev (linear, on the same named
434 branch, or on another named branch). 434 branch, or on another named branch).
435 435
436 This logic is tested by test-update-branches. 436 This logic is tested by test-update-branches.t.
437 437
438 -c -C dirty rev | linear same cross 438 -c -C dirty rev | linear same cross
439 n n n n | ok (1) x 439 n n n n | ok (1) x
440 n n n y | ok ok ok 440 n n n y | ok ok ok
441 n n y * | merge (2) (2) 441 n n y * | merge (2) (2)