2021-04-14 06:42:31 +03:00
|
|
|
#chg-compatible
|
|
|
|
$ setconfig experimental.nativecheckout=true
|
2021-04-27 23:32:08 +03:00
|
|
|
$ setconfig commands.update.check=noconflict
|
2021-04-14 06:42:31 +03:00
|
|
|
$ newserver server
|
|
|
|
|
|
|
|
$ newremoterepo myrepo
|
|
|
|
|
|
|
|
$ echo a > a
|
|
|
|
$ hg add a
|
|
|
|
$ hg commit -m 'A'
|
|
|
|
$ echo a > b
|
|
|
|
$ hg add b
|
|
|
|
$ hg commit -m 'B'
|
|
|
|
$ hg up 'desc(A)'
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo x > b
|
|
|
|
$ hg up 'desc(B)'
|
|
|
|
b: untracked file differs
|
|
|
|
abort: untracked files in working directory differ from files in requested revision
|
|
|
|
[255]
|
2021-04-15 19:24:48 +03:00
|
|
|
$ hg up 'desc(B)' --clean
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2021-04-16 06:07:28 +03:00
|
|
|
$ hg up 'desc(A)'
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo a > b
|
|
|
|
$ hg up 'desc(B)'
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2021-04-23 01:55:29 +03:00
|
|
|
$ rm b
|
|
|
|
$ hg rm b
|
|
|
|
$ echo X > B
|
|
|
|
$ hg add B
|
|
|
|
warning: possible case-folding collision for B
|
|
|
|
$ hg commit -m 'C'
|
|
|
|
$ hg up 'desc(B)'
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ ls
|
|
|
|
a
|
|
|
|
b
|
2021-04-27 23:32:08 +03:00
|
|
|
$ echo Z > a
|
|
|
|
$ hg up 'desc(C)'
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg status
|
|
|
|
M a
|
|
|
|
$ hg up null
|
|
|
|
abort: 1 conflicting file changes:
|
|
|
|
a
|
|
|
|
(commit, shelve, update --clean to discard them, or update --merge to merge them)
|
|
|
|
[255]
|