##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

parsers.c: remove warning: 'size' may be used uninitialized in this function...
parsers.c: remove warning: 'size' may be used uninitialized in this function Some compilers / compiler options (such as gcc 4.7) would emit warnings: mercurial/parsers.c: In function 'pack_dirstate': mercurial/parsers.c:306:18: warning: 'size' may be used uninitialized in this function [-Wmaybe-uninitialized] mercurial/parsers.c:306:12: warning: 'mode' may be used uninitialized in this function [-Wmaybe-uninitialized] It is apparently not smart enough to figure out how the 'err' arithmetics makes sure that it can't happen. 'err' is now replaced with simple checks and goto. That might also help the optimizer when it is inlining getintat().
Mads Kiilerich - - Load All Authors

File last commit:

r15447:9910f60a default
r17165:249cc4ec default
Show More
test-issue660.t
145 lines | 2.0 KiB | text/troff | Tads3Lexer
/ tests / test-issue660.t
History | Source | Raw |Copy content |Copy permalink
Nicolas Dumazet
tests: remove test-issue322 as it's fully included in test-issue660
 r14112 http://mercurial.selenic.com/bts/issue660 and:
http://mercurial.selenic.com/bts/issue322
Adrian Buehlmann
tests: unify test-issue*
 r12195
$ hg init
$ echo a > a
$ mkdir b
$ echo b > b/b
$ hg commit -A -m "a is file, b is dir"
adding a
adding b/b
File replaced with directory:
$ rm a
$ mkdir a
$ echo a > a/a
Should fail - would corrupt dirstate:
$ hg add a/a
abort: file 'a' in dirstate clashes with 'a/a'
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-issue*
 r12195
Removing shadow:
$ hg rm --after a
Should succeed - shadow removed:
$ hg add a/a
Directory replaced with file:
$ rm -r b
$ echo b > b
Should fail - would corrupt dirstate:
$ hg add b
abort: directory 'b' already in dirstate
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-issue*
 r12195
Removing shadow:
$ hg rm --after b/b
Should succeed - shadow removed:
$ hg add b
Look what we got:
$ hg st
A a/a
A b
R a
R b/b
Revert reintroducing shadow - should fail:
$ rm -r a b
$ hg revert b/b
abort: file 'b' in dirstate clashes with 'b/b'
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-issue*
 r12195
Revert all - should succeed:
$ hg revert --all
undeleting a
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 forgetting a/a (glob)
Adrian Buehlmann
tests: unify test-issue*
 r12195 forgetting b
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 undeleting b/b (glob)
Adrian Buehlmann
tests: unify test-issue*
 r12195
$ hg st
addremove:
$ rm -r a b
$ mkdir a
$ echo a > a/a
$ echo b > b
$ hg addremove -s 0
removing a
adding a/a
adding b
removing b/b
$ hg st
A a/a
A b
R a
R b/b
commit:
$ hg ci -A -m "a is dir, b is file"
$ hg st --all
C a/a
C b
Long directory replaced with file:
$ mkdir d
$ mkdir d/d
$ echo d > d/d/d
$ hg commit -A -m "d is long directory"
adding d/d/d
$ rm -r d
$ echo d > d
Should fail - would corrupt dirstate:
$ hg add d
abort: directory 'd' already in dirstate
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-issue*
 r12195
Removing shadow:
$ hg rm --after d/d/d
Should succeed - shadow removed:
$ hg add d
$ hg ci -md
Update should work at least with clean working directory:
$ rm -r a b d
$ hg up -r 0
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st --all
C a
C b/b
$ rm -r a b
$ hg up -r 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st --all
C a/a
C b