view tests/test-journal-exists @ 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

hg init
echo a > a
hg ci -Am0

touch .hg/store/journal

echo foo > a
hg ci -Am0

hg recover