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.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 05 Mar 2008 09:10:45 -0800
parents b6d8972ce339
children c40a1ee20aa5
line wrap: on
line source

#!/bin/sh

hg init
echo a > a
hg ci -Am0

touch .hg/store/journal

echo foo > a
hg ci -Am0

hg recover