tests/test-up-local-change
author mpm@selenic.com
Fri, 26 Aug 2005 16:49:23 -0700
changeset 1072 05dc7aba22eb
parent 981 4f81068ed8cd
child 1581 db10b7114de0
permissions -rwxr-xr-x
Fixes for push corner case TAH found a bug where push would push things the remote already had, raising an assertion. This turned out to be because the changeset protocol was not recording a common subset node in one case. Also discovered was that the protocol was queueing multiple copies of a node for pull. Fixed by changing fetch to a hash. Add some more debugging output.

#!/bin/sh

set -e
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -m "1" -d "0 0"

hg clone . ../r2
cd ../r2
hg up
echo abc > a
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"

cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -m "2" -d "0 0"

cd ../r2
hg -q pull ../r1
hg status
hg --debug up
hg --debug up -m
hg parents
hg -v history
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"