Mercurial > hg
view tests/test-issue522 @ 11346:e740f36cfb4b
tests: rename test-merge3 to test-add-remove.
It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 14 Jun 2010 13:39:00 -0400 |
parents | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh # In the merge below, the file "foo" has the same contents in both # parents, but if we look at the file-level history, we'll notice that # the version in p1 is an ancestor of the version in p2. This test # makes sure that we'll use the version from p2 in the manifest of the # merge revision. hg init repo cd repo echo foo > foo hg ci -qAm 'add foo' echo bar >> foo hg ci -m 'change foo' hg backout -r tip -m 'backout changed foo' hg up -C 0 touch bar hg ci -qAm 'add bar' hg merge --debug hg debugstate | grep foo hg st -A foo hg ci -m 'merge' hg manifest --debug | grep foo hg debugindex .hg/store/data/foo.i