Show More
@@ -329,7 +329,6 b' def updateworkingcopy(repo, assumeclean=' | |||||
329 | trackeddirty = status.modified + status.added |
|
329 | trackeddirty = status.modified + status.added | |
330 | clean = status.clean |
|
330 | clean = status.clean | |
331 | if assumeclean: |
|
331 | if assumeclean: | |
332 | assert not trackeddirty |
|
|||
333 | clean.extend(lookup) |
|
332 | clean.extend(lookup) | |
334 | else: |
|
333 | else: | |
335 | trackeddirty.extend(lookup) |
|
334 | trackeddirty.extend(lookup) |
@@ -515,5 +515,10 b' Test removing include while concurrently' | |||||
515 | $ hg clone --narrow ssh://user@dummy/master narrow-concurrent-modify -q \ |
|
515 | $ hg clone --narrow ssh://user@dummy/master narrow-concurrent-modify -q \ | |
516 | > --include d0 --include d1 |
|
516 | > --include d0 --include d1 | |
517 | $ cd narrow-concurrent-modify |
|
517 | $ cd narrow-concurrent-modify | |
518 |
$ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude d0 |
|
518 | $ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude d0 | |
519 | AssertionError |
|
519 | comparing with ssh://user@dummy/master | |
|
520 | searching for changes | |||
|
521 | looking for local changes to affected paths | |||
|
522 | deleting data/d0/f.i | |||
|
523 | deleting meta/d0/00manifest.i (tree !) | |||
|
524 | not deleting possibly dirty file d0/f |
General Comments 0
You need to be logged in to leave comments.
Login now