comparison tests/test-mq-merge @ 10775:c52057614c72 stable

Tests with spaces in paths

This allows most tests to succeed with
./run-tests.py --tmpdir='/tmp/hg  test'
and introduces other tests for spaces and shell quoting

10772:1e819576e926

#!/bin/sh

# Test issue 529 - mq aborts when merging patch deleting files

rewrite_path()
{
    sed -e 's:\\:/:g' -e 's:[^ ]*/t/::g'
}

checkundo()
{
    if [ -f .hg/store/undo ]; then
	echo ".hg/store/undo still exists after $1"

hg qnew rm_a
hg rm a
hg qrefresh -m "rm a"

# Save the patch queue so we can merge it later
hg qsave -c -e 2>&1 | rewrite_path
checkundo qsave

# Update b and commit in an "update" changeset
hg up -C init
echo b >> b

hg ci -m update

# Here, qpush used to abort with :
# The system cannot find the file specified => a
hg manifest
hg qpush -a -m 2>&1 | rewrite_path
checkundo 'qpush -m'
hg manifest

# ensure status is correct after merge
hg qpop -a

10775:c52057614c72

#!/bin/sh

# Test issue 529 - mq aborts when merging patch deleting files

checkundo()
{
    if [ -f .hg/store/undo ]; then
	echo ".hg/store/undo still exists after $1"

hg qnew rm_a
hg rm a
hg qrefresh -m "rm a"

# Save the patch queue so we can merge it later
hg qsave -c -e 2>&1 | grep -v ^copy
checkundo qsave

# Update b and commit in an "update" changeset
hg up -C init
echo b >> b

hg ci -m update

# Here, qpush used to abort with :
# The system cannot find the file specified => a
hg manifest
hg qpush -a -m 2>&1 | grep -v ^merging
checkundo 'qpush -m'
hg manifest

# ensure status is correct after merge
hg qpop -a