2006-02-18 02:23:53 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
hg init
|
|
|
|
|
|
|
|
echo foo > a
|
|
|
|
echo foo > b
|
|
|
|
hg add a b
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
hg ci -m "test" -d "1000000 0"
|
2006-02-18 02:23:53 +03:00
|
|
|
|
|
|
|
echo blah > a
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
hg ci -m "branch a" -d "1000000 0"
|
2006-02-18 02:23:53 +03:00
|
|
|
|
|
|
|
hg co 0
|
|
|
|
|
|
|
|
echo blah > b
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
hg ci -m "branch b" -d "1000000 0"
|
2006-05-15 08:07:34 +04:00
|
|
|
HGMERGE=true hg merge 1
|
2006-02-18 02:23:53 +03:00
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
hg ci -m "merge b/a -> blah" -d "1000000 0"
|
2006-02-18 02:23:53 +03:00
|
|
|
|
|
|
|
hg co 1
|
2006-05-15 08:07:34 +04:00
|
|
|
HGMERGE=true hg merge 2
|
2006-03-13 15:05:41 +03:00
|
|
|
hg ci -m "merge a/b -> blah" -d "1000000 0"
|
2006-02-18 02:23:53 +03:00
|
|
|
|
|
|
|
hg log
|
2006-12-01 15:34:09 +03:00
|
|
|
hg debugindex .hg/store/00changelog.i
|
2006-02-18 02:23:53 +03:00
|
|
|
|
|
|
|
echo
|
|
|
|
|
|
|
|
echo 1
|
2006-12-01 07:38:48 +03:00
|
|
|
hg manifest --debug 1
|
2006-02-18 02:23:53 +03:00
|
|
|
echo 2
|
2006-12-01 07:38:48 +03:00
|
|
|
hg manifest --debug 2
|
2006-02-18 02:23:53 +03:00
|
|
|
echo 3
|
2006-12-01 07:38:48 +03:00
|
|
|
hg manifest --debug 3
|
2006-02-18 02:23:53 +03:00
|
|
|
echo 4
|
2006-12-01 07:38:48 +03:00
|
|
|
hg manifest --debug 4
|
2006-02-18 02:23:53 +03:00
|
|
|
|
|
|
|
echo
|
|
|
|
|
2006-12-01 15:34:09 +03:00
|
|
|
hg debugindex .hg/store/data/a.i
|
2006-02-18 02:23:53 +03:00
|
|
|
|
2006-05-15 08:07:34 +04:00
|
|
|
hg verify
|