2010-08-18 03:42:44 +04:00
|
|
|
$ hg init
|
|
|
|
$ echo This is file a1 > a
|
|
|
|
$ hg add a
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit #0"
|
2010-08-18 03:42:44 +04:00
|
|
|
$ echo This is file b1 > b
|
|
|
|
$ hg add b
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit #1"
|
2010-08-18 03:42:44 +04:00
|
|
|
$ hg update 0
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo This is file c1 > c
|
|
|
|
$ hg add c
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit #2"
|
2010-08-18 03:42:44 +04:00
|
|
|
created new head
|
|
|
|
$ hg merge 1
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ rm b
|
|
|
|
$ echo This is file c22 > c
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit #3"
|
2010-08-18 03:42:44 +04:00
|
|
|
|