view tests/test-push-warn @ 992:f859e9cba1b9

Fix up some bugs introduced by recent merge changes

- use new changed list to track what files actually got new revlog entries
  at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status

#!/bin/sh

mkdir a
cd a
hg init
echo foo > t1
hg add t1
hg commit -m "1" -d "0 0"

cd ..
hg clone a b

cd a
echo foo > t2
hg add t2
hg commit -m "2" -d "0 0"

cd ../b
echo foo > t3
hg add t3
hg commit -m "3" -d "0 0"

hg push ../a
hg pull ../a
hg push ../a
hg up -m
hg commit -m "4" -d "0 0"
hg push ../a