view tests/test-issue672 @ 5370:61462e7d62ed

changegroup: avoid large copies - handle chunk headers separately rather than prepending them to (potentially large) chunks - break large chunks into 1M pieces for compression - don't prepend file metadata onto (potentially large) file data
author Matt Mackall <mpm@selenic.com>
date Wed, 03 Oct 2007 17:17:28 -0500
parents ad6b97132b81
children
line wrap: on
line source

#!/bin/sh

# 0-2-4
#  \ \ \
#   1-3-5
#
# rename in #1, content change in #4.

hg init t
cd t

touch 1
touch 2
hg commit -Am init -d "0 0"  # 0

hg rename 1 1a
hg commit -m rename -d "0 0" # 1

hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 -d "0 0"  # 2

hg merge --debug 1
hg ci -m merge1 -d "0 0" # 3

hg co -C 2
echo hello >> 1
hg ci -m unrelated2 -d "0 0" # 4

hg co -C 3
hg merge -y --debug 4

hg co -C 4
hg merge -y --debug 3