view tests/test-merge1 @ 598:f8d44a2e6928

[PATCH 4/5]: cleaning the template parent management in hgweb

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH 4/5]: cleaning the template parent management in hgweb

From: Goffredo Baroncelli <[e-mail]>

Now the patch remove every use of the tag p1/p2/p1rev/p2rev from the
code ( even+the ones not used ), replacing everywhere with the tag
parent ( even where the previous +tag are not use ), so the
information to the templates is still given.

manifest hash: ede1f299e9201fdad2ecf48e63314350acbb047e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCyEqxywK+sNU5EO8RAjc5AJ9o8AU6/YRuERblO/0kgWwDN4rqQQCgkVj/
UBtzW5x0yD65mK6rb4f+bQk=
=07yG
-----END PGP SIGNATURE-----

#!/bin/sh -x

cat <<'EOF' > merge
#!/bin/sh
echo merging for `basename $1`
EOF
chmod +x merge

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user

hg update 0
echo This is file c1 > c
hg add c
hg commit -t "commit #2" -d "0 0" -u user
echo This is file b1 > b
env HGMERGE=../merge hg update -m 1
# no merges expected
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user

hg update 0
echo This is file c1 > c
hg add c
hg commit -t "commit #2" -d "0 0" -u user
echo This is file b2 > b
env HGMERGE=../merge hg update -m 1
# merge of b expected
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
echo This is file b22 > b
hg commit -t "commit #2" -d "0 0" -u user
hg update 1
echo This is file c1 > c
hg add c
hg commit -t "commit #3" -d "0 0" -u user
cat b
echo This is file b22 > b
env HGMERGE=../merge hg update -m 2
# merge expected!
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
echo This is file b22 > b
hg commit -t "commit #2" -d "0 0" -u user
hg update 1
echo This is file c1 > c
hg add c
hg commit -t "commit #3" -d "0 0" -u user
echo This is file b33 > b
env HGMERGE=../merge hg update -m 2
# merge of b expected
cd ..; /bin/rm -rf t