tests/test-merge8
author Matt Mackall <mpm@selenic.com>
Thu, 22 Mar 2007 23:37:44 -0500
changeset 4270 cd7b36b7869c
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
restructure changelog file appending - make appending code proper part of changelog with delayupdate/finalize - use simplified appender that tracks pending data in memory - eliminate old appendfile and helper classes - update addchangegroup to use new interface and reuse the existing changelog

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update