Mercurial > hg
view tests/test-issue522 @ 7012:78341ea65d16
restructure helptable
When looking up a help topic, the key is now only matched against the
short names for each topic, and not the header. So
hg help 'Environment Variables'
must be replaced with
hg help env
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Tue, 09 Sep 2008 21:32:39 +0200 |
parents | 90d9ec0dc69d |
children | 6c82beaaa11a |
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 -d '0 0' -qAm 'add foo' echo bar >> foo hg ci -d '0 0' -m 'change foo' hg backout -d '0 0' -r tip -m 'backout changed foo' hg up -C 0 touch bar hg ci -d '0 0' -qAm 'add bar' hg merge --debug hg debugstate | grep foo hg st -A foo hg ci -d '0 0' -m 'merge' hg manifest --debug | grep foo hg debugindex .hg/store/data/foo.i