Show More
@@ -655,9 +655,14 b' def upgrade_dirstate(ui, srcrepo, upgrad' | |||
|
655 | 655 | pass |
|
656 | 656 | |
|
657 | 657 | assert srcrepo.dirstate._use_dirstate_v2 == (old == b'v2') |
|
658 | use_v2 = new == b'v2' | |
|
659 | if use_v2: | |
|
660 | # Write the requirements *before* upgrading | |
|
661 | scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements) | |
|
662 | ||
|
658 | 663 | srcrepo.dirstate._map.preload() |
|
659 |
srcrepo.dirstate._use_dirstate_v2 = |
|
|
660 |
srcrepo.dirstate._map._use_dirstate_v2 = |
|
|
664 | srcrepo.dirstate._use_dirstate_v2 = use_v2 | |
|
665 | srcrepo.dirstate._map._use_dirstate_v2 = use_v2 | |
|
661 | 666 | srcrepo.dirstate._dirty = True |
|
662 | 667 | try: |
|
663 | 668 | srcrepo.vfs.unlink(b'dirstate') |
@@ -667,8 +672,9 b' def upgrade_dirstate(ui, srcrepo, upgrad' | |||
|
667 | 672 | pass |
|
668 | 673 | |
|
669 | 674 | srcrepo.dirstate.write(None) |
|
670 | ||
|
671 | scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements) | |
|
675 | if not use_v2: | |
|
676 | # Remove the v2 requirement *after* downgrading | |
|
677 | scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements) | |
|
672 | 678 | |
|
673 | 679 | |
|
674 | 680 | def upgrade_tracked_hint(ui, srcrepo, upgrade_op, add): |
General Comments 0
You need to be logged in to leave comments.
Login now