tests/bzr-definitions
author Mark Thomas <mbthomas@fb.com>
Mon, 02 Oct 2017 14:05:30 -0700
changeset 34547 81aebcc73beb
parent 26066 89872688893f
child 39222 7a88643bc0ef
permissions -rw-r--r--
merge: add merge action 'p' to record path conflicts during update Add a new merge action to record path conflicts. A status message is printed, and the path conflict is added to the merge state. Differential Revision: https://phab.mercurial-scm.org/D776

# this file holds the definitions that are used in various bzr tests

TERM=dumb; export TERM
echo '[extensions]' >> $HGRCPATH
echo 'convert = ' >> $HGRCPATH

glog()
{
    hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
}

manifest()
{
    echo "% manifest of $2"
    hg -R $1 manifest -v -r $2
}