test-add.t
140 lines
| 2.2 KiB
| text/troff
|
Tads3Lexer
/ tests / test-add.t
Nicolas Dumazet
|
r11795 | $ hg init a | ||
$ cd a | ||||
$ echo a > a | ||||
$ hg add -n | ||||
adding a | ||||
$ hg st | ||||
? a | ||||
$ hg add | ||||
adding a | ||||
$ hg st | ||||
A a | ||||
$ hg forget a | ||||
$ hg add | ||||
adding a | ||||
$ hg st | ||||
A a | ||||
$ echo b > b | ||||
$ hg add -n b | ||||
$ hg st | ||||
A a | ||||
? b | ||||
Matt Mackall
|
r12365 | $ hg add b | ||
Nicolas Dumazet
|
r11795 | $ hg st | ||
A a | ||||
A b | ||||
should fail | ||||
$ hg add b | ||||
b already tracked! | ||||
$ hg st | ||||
A a | ||||
A b | ||||
Adrian Buehlmann
|
r16875 | #if no-windows | ||
Adrian Buehlmann
|
r13962 | $ echo foo > con.xml | ||
$ hg --config ui.portablefilenames=jump add con.xml | ||||
abort: ui.portablefilenames value is invalid ('jump') | ||||
[255] | ||||
$ hg --config ui.portablefilenames=abort add con.xml | ||||
abort: filename contains 'con', which is reserved on Windows: 'con.xml' | ||||
[255] | ||||
$ hg st | ||||
A a | ||||
A b | ||||
? con.xml | ||||
$ hg add con.xml | ||||
warning: filename contains 'con', which is reserved on Windows: 'con.xml' | ||||
$ hg st | ||||
A a | ||||
A b | ||||
A con.xml | ||||
Mads Kiilerich
|
r16974 | $ hg forget con.xml | ||
$ rm con.xml | ||||
#endif | ||||
#if eol-in-paths | ||||
Adrian Buehlmann
|
r13962 | $ echo bla > 'hello:world' | ||
$ hg --config ui.portablefilenames=abort add | ||||
adding hello:world | ||||
abort: filename contains ':', which is reserved on Windows: 'hello:world' | ||||
[255] | ||||
$ hg st | ||||
A a | ||||
A b | ||||
? hello:world | ||||
$ hg --config ui.portablefilenames=ignore add | ||||
adding hello:world | ||||
$ hg st | ||||
A a | ||||
A b | ||||
A hello:world | ||||
Adrian Buehlmann
|
r16875 | #endif | ||
Adrian Buehlmann
|
r13962 | |||
Nicolas Dumazet
|
r11795 | $ hg ci -m 0 --traceback | ||
should fail | ||||
$ hg add a | ||||
a already tracked! | ||||
$ echo aa > a | ||||
$ hg ci -m 1 | ||||
$ hg up 0 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo aaa > a | ||||
$ hg ci -m 2 | ||||
created new head | ||||
$ hg merge | ||||
merging a | ||||
warning: conflicts during merge. | ||||
Matt Mackall
|
r15501 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
Nicolas Dumazet
|
r11795 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
Brodie Rao
|
r12314 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | ||
Matt Mackall
|
r12316 | [1] | ||
Nicolas Dumazet
|
r11795 | $ hg st | ||
M a | ||||
? a.orig | ||||
should fail | ||||
$ hg add a | ||||
a already tracked! | ||||
$ hg st | ||||
M a | ||||
? a.orig | ||||
$ hg resolve -m a | ||||
$ hg ci -m merge | ||||
Martin Geisler
|
r12399 | Issue683: peculiarity with hg revert of an removed then added file | ||
Nicolas Dumazet
|
r11795 | |||
$ hg forget a | ||||
$ hg add a | ||||
$ hg st | ||||
? a.orig | ||||
$ hg rm a | ||||
$ hg st | ||||
R a | ||||
? a.orig | ||||
$ echo a > a | ||||
$ hg add a | ||||
$ hg st | ||||
M a | ||||
? a.orig | ||||
$ hg add c && echo "unexpected addition of missing file" | ||||
Mads Kiilerich
|
r15521 | c: * (glob) | ||
Matt Mackall
|
r12316 | [1] | ||
Nicolas Dumazet
|
r11795 | $ echo c > c | ||
$ hg add d c && echo "unexpected addition of missing file" | ||||
Mads Kiilerich
|
r15521 | d: * (glob) | ||
Matt Mackall
|
r12316 | [1] | ||
Nicolas Dumazet
|
r11795 | $ hg st | ||
M a | ||||
A c | ||||
? a.orig | ||||
Mads Kiilerich
|
r16913 | $ cd .. | ||