2010-09-11 19:58:37 +04:00
|
|
|
$ hg init
|
|
|
|
|
|
|
|
$ echo a > a
|
|
|
|
$ hg ci -qAm 'add a'
|
|
|
|
|
|
|
|
$ echo b > b
|
|
|
|
$ hg ci -qAm 'add b'
|
|
|
|
|
|
|
|
$ hg up -qC 0
|
|
|
|
$ hg rm a
|
|
|
|
$ hg ci -m 'rm a'
|
|
|
|
created new head
|
|
|
|
|
|
|
|
$ hg up -qC 1
|
|
|
|
$ rm a
|
|
|
|
|
|
|
|
Local deleted a file, remote removed
|
|
|
|
|
|
|
|
Should fail, since there are deleted files:
|
|
|
|
|
|
|
|
$ hg merge
|
2013-09-24 07:50:51 +04:00
|
|
|
abort: uncommitted changes
|
2011-12-07 21:23:01 +04:00
|
|
|
(use 'hg status' to list changes)
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-09-11 19:58:37 +04:00
|
|
|
|
|
|
|
Should succeed with --force:
|
|
|
|
|
|
|
|
$ hg -v merge --force
|
|
|
|
resolving manifests
|
|
|
|
removing a
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
|
|
|
Should show 'a' as removed:
|
|
|
|
|
|
|
|
$ hg status
|
|
|
|
R a
|
|
|
|
|
|
|
|
$ hg ci -m merge
|
|
|
|
|
|
|
|
Should not show 'a':
|
|
|
|
|
|
|
|
$ hg manifest
|
|
|
|
b
|
|
|
|
|