test-pathconflicts-basic.t
99 lines
| 2.3 KiB
| text/troff
|
Tads3Lexer
/ tests / test-pathconflicts-basic.t
|
r34545 | $ hg init repo | ||
$ cd repo | ||||
$ echo base > base | ||||
$ hg add base | ||||
$ hg commit -m "base" | ||||
$ hg bookmark -i base | ||||
$ echo 1 > a | ||||
$ hg add a | ||||
$ hg commit -m "file" | ||||
$ hg bookmark -i file | ||||
$ echo 2 > a | ||||
$ hg commit -m "file2" | ||||
$ hg bookmark -i file2 | ||||
$ hg up -q 0 | ||||
$ mkdir a | ||||
$ echo 2 > a/b | ||||
$ hg add a/b | ||||
$ hg commit -m "dir" | ||||
created new head | ||||
$ hg bookmark -i dir | ||||
Basic merge - local file conflicts with remote directory | ||||
$ hg up -q file | ||||
$ hg bookmark -i | ||||
$ hg merge --verbose dir | ||||
resolving manifests | ||||
|
r34556 | a: path conflict - a file or link has the same name as a directory | ||
the local file has been renamed to a~853701544ac3 | ||||
resolve manually then use 'hg resolve --mark a' | ||||
moving a to a~853701544ac3 | ||||
|
r34545 | getting a/b | ||
|
r34556 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | ||||
[1] | ||||
|
r34545 | $ hg update --clean . | ||
|
r34556 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r34557 | $ rm a~853701544ac3 | ||
|
r34545 | |||
Basic update - local directory conflicts with remote file | ||||
$ hg up -q 0 | ||||
$ mkdir a | ||||
$ echo 3 > a/b | ||||
$ hg up file | ||||
|
r34554 | a: untracked directory conflicts with file | ||
|
r34553 | abort: untracked files in working directory differ from files in requested revision | ||
|
r34545 | [255] | ||
$ hg up --clean file | ||||
|
r34557 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(activating bookmark file) | ||||
Repo state is ok | ||||
|
r34545 | |||
|
r34557 | $ hg sum | ||
parent: 1:853701544ac3 | ||||
file | ||||
branch: default | ||||
bookmarks: *file | ||||
commit: (clean) | ||||
update: 2 new changesets (update) | ||||
phases: 4 draft | ||||
|
r34545 | |||
Basic update - untracked file conflicts with remote directory | ||||
$ hg up -q 0 | ||||
$ echo untracked > a | ||||
$ hg up --config merge.checkunknown=warn dir | ||||
|
r34553 | a: replacing untracked file | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(activating bookmark dir) | ||||
|
r34557 | $ cat a.orig | ||
untracked | ||||
$ rm -f a.orig | ||||
|
r34545 | |||
Basic clean update - local directory conflicts with changed remote file | ||||
$ hg up -q file | ||||
$ rm a | ||||
$ mkdir a | ||||
$ echo 4 > a/b | ||||
$ hg up file2 | ||||
abort: *: '$TESTTMP/repo/a' (glob) | ||||
[255] | ||||
$ hg up --clean file2 | ||||
|
r34557 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(activating bookmark file2) | ||||
Repo state is ok | ||||
|
r34545 | |||
|
r34557 | $ hg sum | ||
parent: 2:f64e09fac717 | ||||
file2 | ||||
branch: default | ||||
bookmarks: *file2 | ||||
commit: (clean) | ||||
update: 1 new changesets, 2 branch heads (merge) | ||||
phases: 4 draft | ||||
|
r34545 | |||