Mercurial > public > mercurial-scm > hg-stable
diff tests/test-excessive-merge @ 1716:ef8cd889a78b
Refactor excessive merge detection, add test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 17 Feb 2006 17:23:53 -0600 |
parents | |
children | 7544700fd931 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-excessive-merge Fri Feb 17 17:23:53 2006 -0600 @@ -0,0 +1,46 @@ +#!/bin/sh + +hg init + +echo foo > a +echo foo > b +hg add a b + +hg ci -m "test" -d "0 0" + +echo blah > a + +hg ci -m "branch a" -d "0 0" + +hg co 0 + +echo blah > b + +hg ci -m "branch b" -d "0 0" +HGMERGE=true hg up -m 1 + +hg ci -m "merge b/a -> blah" -d "0 0" + +hg co 1 +HGMERGE=true hg up -m 2 +hg ci -m "merge a/b -> blah" -d "0 0" + +hg log +hg debugindex .hg/00changelog.i + +echo + +echo 1 +hg manifest 1 +echo 2 +hg manifest 2 +echo 3 +hg manifest 3 +echo 4 +hg manifest 4 + +echo + +hg debugindex .hg/data/a.i + +hg verify \ No newline at end of file