view tests/test-rebuildstate @ 6206:0b6f12495276

fetch: switch the default parent used for a merge

This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.

The prior default behaviour is still available, via the --switch-parent
option.

#!/bin/sh
# basic test for hg debugrebuildstate

hg init repo
cd repo

touch foo bar
hg ci -Am 'add foo bar'

touch baz
hg add baz
hg rm bar

echo '% state dump'
hg debugstate | cut -b 1-16,37- | sort
echo '% status'
hg st -A

hg debugrebuildstate
echo '% state dump'
hg debugstate | cut -b 1-16,37- | sort
echo '% status'
hg st -A