comparison tests/test-fetch @ 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.

6205:b193a6e59131

hg --cwd c commit -d '3 0' -Amc

hg clone c d
hg clone c e

hg --cwd c fetch -d '4 0' -m 'automated merge' ../a
ls c

hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid
cat a/hg.pid >> "$DAEMON_PIDS"

hg --cwd d tip --template '{desc}\n'

echo '% fetch over http with auth (should be hidden in desc)'
hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/
hg --cwd e tip --template '{desc}\n'

6206:0b6f12495276

hg --cwd c commit -d '3 0' -Amc

hg clone c d
hg clone c e

echo % should merge c into a
hg --cwd c fetch -d '4 0' -m 'automated merge' ../a
ls c

hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid
cat a/hg.pid >> "$DAEMON_PIDS"

hg --cwd d tip --template '{desc}\n'

echo '% fetch over http with auth (should be hidden in desc)'
hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/
hg --cwd e tip --template '{desc}\n'

hg clone a f
hg clone a g

echo f > f/f
hg --cwd f ci -d '6 0' -Amf

echo g > g/g
hg --cwd g ci -d '6 0' -Amg

echo % should merge f into g
hg --cwd g fetch --switch ../f