tests/test-merge-revert2
author bos@serpentine.internal.keyresearch.com
Thu, 01 Sep 2005 09:08:21 -0700
changeset 1191 77a0c7528c2f
parent 981 4f81068ed8cd
child 1933 7544700fd931
permissions -rwxr-xr-x
Revert changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e. I inadvertantly used "hg import" on a message I saved, expecting it to do the right thing, but instead it made the commit look like I authored it, and filled the description with the email header. Changeset 737f9b90c571b3991f7e35dc846e7ef38a475cfe contains a guard against "hg import" doing this again.

#!/bin/sh

mkdir t
cd t
hg init
echo "added file1" > file1
echo "another line of text" >> file1
echo "added file2" > file2
hg add file1 file2
hg commit -m "added file1 and file2" -d "0 0" -u user
echo "changed file1" >> file1
hg commit -m "changed file1" -d "0 0" -u user
hg -q log
hg id
hg update -C 0
hg id
echo "changed file1" >> file1
hg id
hg revert
hg diff
hg status
hg id
hg update
hg diff
hg status
hg id
hg update -C 0
echo "changed file1 different" >> file1
HGMERGE=merge hg update
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \
              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
hg status
hg id
hg revert
hg diff
hg status
hg id
hg revert -r tip
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id
cd ..; /bin/rm -rf t