Mercurial > hg
view tests/test-hgrc @ 10505:b3311e26f94f stable
merge: fix --preview to show all nodes that will be merged (issue2043).
Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge. The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Feb 2010 15:25:29 -0500 |
parents | 40dfd46d098f |
children | 42afde35e9f7 |
line wrap: on
line source
#!/bin/sh echo "invalid" > $HGRCPATH hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" echo "" > $HGRCPATH # issue1199: escaping hg init "foo%bar" hg clone "foo%bar" foobar p=`pwd` cd foobar cat .hg/hgrc | sed -e "s:$p:...:" hg paths | sed -e "s:$p:...:" hg showconfig | sed -e "s:$p:...:" cd .. # issue1829: wrong indentation echo '[foo]' > $HGRCPATH echo ' x = y' >> $HGRCPATH hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \ > $HGRCPATH hg showconfig foo echo '%include /no-such-file' > $HGRCPATH hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" # HGPLAIN cd .. p=`pwd` echo "[ui]" > $HGRCPATH echo "debug=true" >> $HGRCPATH echo "fallbackencoding=ASCII" >> $HGRCPATH echo "quiet=true" >> $HGRCPATH echo "traceback=true" >> $HGRCPATH echo "verbose=true" >> $HGRCPATH echo "[defaults]" >> $HGRCPATH echo "identify=-n" >> $HGRCPATH echo '% customized hgrc' hg showconfig | sed -e "s:$p:...:" echo '% plain hgrc' HGPLAIN=; export HGPLAIN hg showconfig --config ui.traceback=True --debug | sed -e "s:$p:...:"