##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

update tests...
update tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update tests manifest hash: 70079385599132ca8f90582e1f9317ca46167532 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyaISywK+sNU5EO8RApnGAJ0blIxE0tKPzcRQUDAHCLe5KmUSNgCgjGoA kV4Os9FG1NmGaCysPIsKwts= =Ee67 -----END PGP SIGNATURE-----
Matt Mackall - - Load All Authors

File last commit:

r619:d96c1153 default
r619:d96c1153 default
Show More
test-merge6
46 lines | 720 B | text/plain | TextLexer
/ tests / test-merge6
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh -x
cat <<'EOF' > merge
#!/bin/sh
echo merging for `basename $1`
EOF
chmod +x merge
export HGMERGE=./merge
mkdir A1
cd A1
hg init
echo This is file foo1 > foo
echo This is file bar1 > bar
hg add foo bar
hg commit -t "commit text" -d "0 0" -u user
cd ..
hg clone A1 B1
cd A1
rm bar
hg remove bar
hg commit -t "commit test" -d "0 0" -u user
cd ../B1
echo This is file foo22 > foo
hg commit -t "commit test" -d "0 0" -u user
cd ..
hg clone A1 A2
hg clone B1 B2
cd A1
hg pull ../B1
hg update -m
hg commit -t "commit test" -d "0 0" -u user
echo bar should remain deleted.
hg manifest
cd ../B2
hg pull ../A2
hg update -m
hg commit -t "commit test" -d "0 0" -u user
echo bar should remain deleted.
hg manifest