2005-07-29 18:19:43 +04:00
|
|
|
#!/bin/sh
|
2005-07-03 10:54:35 +04:00
|
|
|
hg --debug init
|
2005-06-24 01:34:13 +04:00
|
|
|
echo this is a1 > a
|
2005-07-03 10:54:35 +04:00
|
|
|
hg add a
|
2005-07-22 00:05:17 +04:00
|
|
|
hg commit -m0 -d "0 0"
|
2005-06-24 01:34:13 +04:00
|
|
|
echo this is b1 > b
|
2005-07-03 10:54:35 +04:00
|
|
|
hg add b
|
2005-07-22 00:05:17 +04:00
|
|
|
hg commit -m1 -d "0 0"
|
2005-07-03 10:54:35 +04:00
|
|
|
hg manifest 1
|
2005-06-24 01:34:13 +04:00
|
|
|
echo this is c1 > c
|
2005-07-22 00:05:17 +04:00
|
|
|
hg rawcommit -p 1 -d "0 0" -m2 c
|
2005-07-03 10:54:35 +04:00
|
|
|
hg manifest 2
|
|
|
|
hg parents
|
2005-06-24 01:34:13 +04:00
|
|
|
rm b
|
2005-07-22 00:05:17 +04:00
|
|
|
hg rawcommit -p 2 -d "0 0" -m3 b
|
2005-07-03 10:54:35 +04:00
|
|
|
hg manifest 3
|
|
|
|
hg parents
|
2005-06-24 01:34:13 +04:00
|
|
|
echo this is a22 > a
|
2005-07-22 00:05:17 +04:00
|
|
|
hg rawcommit -p 3 -d "0 0" -m4 a
|
2005-07-03 10:54:35 +04:00
|
|
|
hg manifest 4
|
|
|
|
hg parents
|
2005-06-24 01:34:13 +04:00
|
|
|
echo this is c22 > c
|
2005-07-22 00:05:17 +04:00
|
|
|
hg rawcommit -p 1 -d "0 0" -m5 c
|
2005-07-03 10:54:35 +04:00
|
|
|
hg manifest 5
|
|
|
|
hg parents
|
2005-06-24 01:34:13 +04:00
|
|
|
# merge, but no files changed
|
2005-07-22 00:05:17 +04:00
|
|
|
hg rawcommit -p 4 -p 5 -d "0 0" -m6
|
2005-07-03 10:54:35 +04:00
|
|
|
hg manifest 6
|
|
|
|
hg parents
|
2005-06-24 01:34:13 +04:00
|
|
|
# no changes what-so-ever
|
2005-07-22 00:05:17 +04:00
|
|
|
hg rawcommit -p 6 -d "0 0" -m7
|
2005-07-03 10:54:35 +04:00
|
|
|
hg manifest 7
|
|
|
|
hg parents
|