tests/test-merge-revert2
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 22 Aug 2006 20:45:03 -0300
changeset 3010 494521a3f142
parent 2965 890e285c52a1
child 3192 096f1c73cdc3
permissions -rwxr-xr-x
Only read .hg/hgrc files from trusted users/groups The list of trusted users and groups is specified in the [trusted] section of a hgrc; the current user is always trusted; "*" can be used to trust all users/groups. Global hgrc files are always read. On Windows (and other systems that don't have the pwd and grp modules), all .hg/hgrc files are read.

#!/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 "1000000 0" -u user
echo "changed file1" >> file1
hg commit -m "changed file1" -d "1000000 0" -u user
hg -q log
hg id
hg update -C 0
hg id
echo "changed file1" >> file1
hg id
hg revert --no-backup --all
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 --no-backup --all
hg diff
hg status
hg id
hg revert -r tip --no-backup --all
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id
cd ..; /bin/rm -rf t