2010-09-18 02:03:08 +04:00
|
|
|
Test update logic when there are renames
|
2010-09-14 17:37:10 +04:00
|
|
|
|
2010-09-18 02:03:08 +04:00
|
|
|
Update with local changes across a file rename
|
2010-09-14 17:37:10 +04:00
|
|
|
|
|
|
|
$ hg init
|
|
|
|
|
|
|
|
$ echo a > a
|
|
|
|
$ hg add a
|
|
|
|
$ hg ci -m a
|
|
|
|
|
|
|
|
$ hg mv a b
|
|
|
|
$ hg ci -m rename
|
|
|
|
|
|
|
|
$ echo b > b
|
|
|
|
$ hg ci -m change
|
|
|
|
|
|
|
|
$ hg up -q 0
|
|
|
|
|
|
|
|
$ echo c > a
|
|
|
|
|
|
|
|
$ hg up
|
|
|
|
merging a and b to b
|
|
|
|
warning: conflicts during merge.
|
2011-11-17 04:04:19 +04:00
|
|
|
merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
|
2010-09-14 17:37:10 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
use 'hg resolve' to retry unresolved file merges
|
2010-09-17 02:51:32 +04:00
|
|
|
[1]
|