test-add.t
241 lines
| 4.8 KiB
| text/troff
|
Tads3Lexer
/ tests / test-add.t
|
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 | ||||
|
r12365 | $ hg add b | ||
|
r11795 | $ hg st | ||
A a | ||||
A b | ||||
should fail | ||||
$ hg add b | ||||
b already tracked! | ||||
$ hg st | ||||
A a | ||||
A b | ||||
|
r16875 | #if no-windows | ||
|
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 | ||||
|
r16974 | $ hg forget con.xml | ||
$ rm con.xml | ||||
#endif | ||||
#if eol-in-paths | ||||
|
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 | ||||
|
r16875 | #endif | ||
|
r13962 | |||
|
r11795 | $ hg ci -m 0 --traceback | ||
|
r25689 | $ hg log -r "heads(. or wdir() & file('**'))" | ||
changeset: 0:* (glob) | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 0 | ||||
|
r11795 | 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. | ||||
|
r15501 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r11795 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
|
r12314 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | ||
|
r12316 | [1] | ||
|
r11795 | $ hg st | ||
M a | ||||
? a.orig | ||||
|
r25689 | wdir doesn't cause a crash, and can be dynamically selected if dirty | ||
$ hg log -r "heads(. or wdir() & file('**'))" | ||||
changeset: 2:*+ (glob) | ||||
parent: 2:* (glob) | ||||
parent: 1:* (glob) | ||||
user: test | ||||
date: * (glob) | ||||
|
r11795 | should fail | ||
$ hg add a | ||||
a already tracked! | ||||
$ hg st | ||||
M a | ||||
? a.orig | ||||
$ hg resolve -m a | ||||
|
r21947 | (no more unresolved files) | ||
|
r11795 | $ hg ci -m merge | ||
|
r12399 | Issue683: peculiarity with hg revert of an removed then added file | ||
|
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 | ||||
|
r23258 | Forgotten file can be added back (as either clean or modified) | ||
$ hg forget b | ||||
$ hg add b | ||||
$ hg st -A b | ||||
C b | ||||
$ hg forget b | ||||
$ echo modified > b | ||||
$ hg add b | ||||
$ hg st -A b | ||||
M b | ||||
$ hg revert -qC b | ||||
|
r11795 | $ hg add c && echo "unexpected addition of missing file" | ||
|
r15521 | c: * (glob) | ||
|
r12316 | [1] | ||
|
r11795 | $ echo c > c | ||
$ hg add d c && echo "unexpected addition of missing file" | ||||
|
r15521 | d: * (glob) | ||
|
r12316 | [1] | ||
|
r11795 | $ hg st | ||
M a | ||||
A c | ||||
? a.orig | ||||
|
r19987 | $ hg up -C | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
forget and get should have the right order: added but missing dir should be | ||||
forgotten before file with same name is added | ||||
$ echo file d > d | ||||
$ hg add d | ||||
$ hg ci -md | ||||
$ hg rm d | ||||
$ mkdir d | ||||
$ echo a > d/a | ||||
$ hg add d/a | ||||
$ rm -r d | ||||
$ hg up -C | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cat d | ||||
file d | ||||
|
r11795 | |||
|
r24537 | Test that adding a directory doesn't require case matching (issue4578) | ||
#if icasefs | ||||
$ mkdir -p CapsDir1/CapsDir | ||||
$ echo abc > CapsDir1/CapsDir/AbC.txt | ||||
$ mkdir CapsDir1/CapsDir/SubDir | ||||
$ echo def > CapsDir1/CapsDir/SubDir/Def.txt | ||||
|
r24790 | $ hg add capsdir1/capsdir | ||
|
r24537 | adding CapsDir1/CapsDir/AbC.txt (glob) | ||
adding CapsDir1/CapsDir/SubDir/Def.txt (glob) | ||||
|
r24548 | |||
$ hg forget capsdir1/capsdir/abc.txt | ||||
removing CapsDir1/CapsDir/AbC.txt (glob) | ||||
|
r24790 | |||
$ hg forget capsdir1/capsdir | ||||
removing CapsDir1/CapsDir/SubDir/Def.txt (glob) | ||||
$ hg add capsdir1 | ||||
adding CapsDir1/CapsDir/AbC.txt (glob) | ||||
adding CapsDir1/CapsDir/SubDir/Def.txt (glob) | ||||
$ hg ci -m "AbCDef" capsdir1/capsdir | ||||
$ hg status -A capsdir1/capsdir | ||||
C CapsDir1/CapsDir/AbC.txt | ||||
C CapsDir1/CapsDir/SubDir/Def.txt | ||||
$ hg files capsdir1/capsdir | ||||
CapsDir1/CapsDir/AbC.txt (glob) | ||||
CapsDir1/CapsDir/SubDir/Def.txt (glob) | ||||
$ echo xyz > CapsDir1/CapsDir/SubDir/Def.txt | ||||
$ hg ci -m xyz capsdir1/capsdir/subdir/def.txt | ||||
$ hg revert -r '.^' capsdir1/capsdir | ||||
reverting CapsDir1/CapsDir/SubDir/Def.txt (glob) | ||||
|
r24807 | The conditional tests above mean the hash on the diff line differs on Windows | ||
and OS X | ||||
|
r24790 | $ hg diff capsdir1/capsdir | ||
|
r24807 | diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob) | ||
|
r24790 | --- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/CapsDir1/CapsDir/SubDir/Def.txt * +0000 (glob) | ||||
@@ -1,1 +1,1 @@ | ||||
-xyz | ||||
+def | ||||
$ hg remove -f 'glob:**.txt' -X capsdir1/capsdir | ||||
$ hg remove -f 'glob:**.txt' -I capsdir1/capsdir | ||||
removing CapsDir1/CapsDir/AbC.txt (glob) | ||||
removing CapsDir1/CapsDir/SubDir/Def.txt (glob) | ||||
|
r24537 | #endif | ||
|
r16913 | $ cd .. | ||