view tests/bzr-definitions @ 39576:fa4d16daf1be

context: don't count deleted files as candidates for path conflicts in IMM

This patch makes sure we don't consider the deleted files in our IMM wctx
as potential conflicts while calculating paths conflicts. This fixes the bug
demonstrated in previous patch.

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

# 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
}