Mercurial > hg
view tests/test-mq-strip @ 12083:ebfc46929f3e stable
help: refer to user configuration file more consistently
Currently, a number of commands and help topics mention the user hgrc
file in different ways. Among these are following:
1. .hgrc - "please specify your commit editor/username in your .hgrc
file", bookmarks, color, hgk, pager, hg help environment
2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1)
3. ~/.hgrc - hgrc(5)
In addition to being inconsistent, none of these make sense on
Windows. This patch replaces the above with a more general term of
"[your] configuration file".
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 27 Aug 2010 22:36:35 -0400 |
parents | 64f284da1278 |
children | e2bce1c717fa |
line wrap: on
line source
#!/bin/sh . $TESTDIR/helpers.sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH teststrip() { hg up -C $1 echo % before update $1, strip $2 hg parents hg strip $2 | hidebackup echo % after update $1, strip $2 hg parents hg unbundle -q .hg/strip-backup/* rm .hg/strip-backup/* } hg init test cd test echo foo > bar hg ci -Ama echo more >> bar hg ci -Amb echo blah >> bar hg ci -Amc hg up 1 echo blah >> bar hg ci -Amd echo final >> bar hg ci -Ame hg log teststrip 4 4 teststrip 4 3 teststrip 1 4 teststrip 4 2 teststrip 4 1 teststrip null 4 hg log hg up -C 2 hg merge 4 echo % before strip of merge parent hg parents hg strip 4 2>&1 | hidebackup echo % after strip of merge parent hg parents #strip of applied mq should cleanup status file hg up -C 3 echo fooagain >> bar hg ci -mf hg qimport -r tip:2 echo % applied patches before strip hg qapplied echo % stripping revision in queue hg strip 3 | hidebackup echo % applied patches after stripping rev in queue hg qapplied echo % stripping ancestor of queue hg strip 1 | hidebackup echo % applied patches after stripping ancestor of queue hg qapplied