Show More
@@ -651,7 +651,10 b' class revlog(object):' | |||||
651 | nodemap_data = nodemaputil.persisted_data(self) |
|
651 | nodemap_data = nodemaputil.persisted_data(self) | |
652 | if nodemap_data is not None: |
|
652 | if nodemap_data is not None: | |
653 | docket = nodemap_data[0] |
|
653 | docket = nodemap_data[0] | |
654 | if d[0][docket.tip_rev][7] == docket.tip_node: |
|
654 | if ( | |
|
655 | len(d[0]) > docket.tip_rev | |||
|
656 | and d[0][docket.tip_rev][7] == docket.tip_node | |||
|
657 | ): | |||
655 | # no changelog tampering |
|
658 | # no changelog tampering | |
656 | self._nodemap_docket = docket |
|
659 | self._nodemap_docket = docket | |
657 | index.update_nodemap_data(*nodemap_data) |
|
660 | index.update_nodemap_data(*nodemap_data) |
@@ -411,3 +411,25 b' Check that a failing transaction will pr' | |||||
411 | .hg/store/00changelog-????????????????.nd: size=123584, sha256=8c6cef6fd3d3fac291968793ee19a4be6d0b8375e9508bd5c7d4a8879e8df180 (glob) (pure !) |
|
411 | .hg/store/00changelog-????????????????.nd: size=123584, sha256=8c6cef6fd3d3fac291968793ee19a4be6d0b8375e9508bd5c7d4a8879e8df180 (glob) (pure !) | |
412 | .hg/store/00changelog-????????????????.nd: size=123584, sha256=eb9e9a4bcafdb5e1344bc8a0cbb3288b2106413b8efae6265fb8a7973d7e97f9 (glob) (rust !) |
|
412 | .hg/store/00changelog-????????????????.nd: size=123584, sha256=eb9e9a4bcafdb5e1344bc8a0cbb3288b2106413b8efae6265fb8a7973d7e97f9 (glob) (rust !) | |
413 | .hg/store/00changelog-????????????????.nd: size=123136, sha256=4f504f5a834db3811ced50ab3e9e80bcae3581bb0f9b13a7a9f94b7fc34bcebe (glob) (no-pure no-rust !) |
|
413 | .hg/store/00changelog-????????????????.nd: size=123136, sha256=4f504f5a834db3811ced50ab3e9e80bcae3581bb0f9b13a7a9f94b7fc34bcebe (glob) (no-pure no-rust !) | |
|
414 | ||||
|
415 | Check that removing content does not confuse the nodemap | |||
|
416 | -------------------------------------------------------- | |||
|
417 | ||||
|
418 | removing data with rollback | |||
|
419 | ||||
|
420 | $ echo aso > a | |||
|
421 | $ hg ci -m a4 | |||
|
422 | $ hg rollback | |||
|
423 | repository tip rolled back to revision 5005 (undo commit) | |||
|
424 | working directory now based on revision 5005 | |||
|
425 | $ hg id -r . | |||
|
426 | bae4d45c759e tip | |||
|
427 | ||||
|
428 | roming data with strip | |||
|
429 | ||||
|
430 | $ echo aso > a | |||
|
431 | $ hg ci -m a4 | |||
|
432 | $ hg --config extensions.strip= strip -r . --no-backup | |||
|
433 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
434 | $ hg id -r . --traceback | |||
|
435 | bae4d45c759e tip |
General Comments 0
You need to be logged in to leave comments.
Login now