view tests/bzr-definitions @ 44399:a45ffad9ae98

merge: introduce a merge() for that use-case

In the same vein as some earlier patches like f546d2170b0f (merge:
introduce a clean_update() for that use-case, 2020-01-15).

Differential Revision: https://phab.mercurial-scm.org/D8168

# 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+: [{file_adds}], files-: [{file_dels}], files: [{file_mods}]\n' "$@"
}

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