Show More
@@ -0,0 +1,10 b'' | |||||
|
1 | #!/bin/sh -x | |||
|
2 | ||||
|
3 | hg init | |||
|
4 | echo This is file a1 > a | |||
|
5 | hg add a | |||
|
6 | hg commit -t "commit #0" -d "0 0" -u user | |||
|
7 | touch b | |||
|
8 | hg add b | |||
|
9 | rm b | |||
|
10 | hg commit -A -t"comment #1" -d "0 0" -u user |
@@ -0,0 +1,9 b'' | |||||
|
1 | + hg init | |||
|
2 | + echo This is file a1 | |||
|
3 | + hg add a | |||
|
4 | + hg commit -t 'commit #0' -d '0 0' -u user | |||
|
5 | + touch b | |||
|
6 | + hg add b | |||
|
7 | + rm b | |||
|
8 | + hg commit -A '-tcomment #1' -d '0 0' -u user | |||
|
9 | b never committed! |
@@ -706,6 +706,9 b' class localrepository:' | |||||
706 | p = self.wjoin(f) |
|
706 | p = self.wjoin(f) | |
707 | if os.path.isfile(p): |
|
707 | if os.path.isfile(p): | |
708 | self.ui.warn("%s still exists!\n" % f) |
|
708 | self.ui.warn("%s still exists!\n" % f) | |
|
709 | elif self.dirstate.state(f) == 'a': | |||
|
710 | self.ui.warn("%s never committed!\n" % f) | |||
|
711 | self.dirstate.forget(f) | |||
709 | elif f not in self.dirstate: |
|
712 | elif f not in self.dirstate: | |
710 | self.ui.warn("%s not tracked!\n" % f) |
|
713 | self.ui.warn("%s not tracked!\n" % f) | |
711 | else: |
|
714 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now