hgext/narrow/TODO.rst
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 19 Jun 2020 13:27:46 +0200
changeset 45476 9bd60ec60601
parent 41046 ce0bc2952e2a
permissions -rw-r--r--
tests: add criss cross merging tests whose behavior need to be fixed Merging two changesets can mark a file as removed post merge. However, in some cases, a user might not want to remove that file and they revert the removal back and commit the merge. All this works perfectly well. However, when we do criss-cross merges with such merge where user explicitly choose to revert the removal with one where another user choose the removal, we does not get any conflict. The intent here is conflicting and merge should result in conflicts. One user merged and want to keep the file while other user merged and want to remove the file. Merging those merges should result in conflicts. This patch adds test cases for these cases. Differential Revision: https://phab.mercurial-scm.org/D8939
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
39787
a063786c89fb narrow: remove narrowrevlog
Gregory Szorc <gregory.szorc@gmail.com>
parents: 39561
diff changeset
     1
Address commentary in manifest.excludedmanifestrevlog.add -
36142
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
specifically we should improve the collaboration with core so that
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
     3
add() never gets called on an excluded directory and we can improve
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
     4
the stand-in to raise a ProgrammingError.
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
     5
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
     6
Reason more completely about rename-filtering logic in
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
     7
narrowfilelog. There could be some surprises lurking there.
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
     8
40081
56d4f88530fc narrow: update TODO.rst now that we share format with sparse
Martin von Zweigbergk <martinvonz@google.com>
parents: 40080
diff changeset
     9
Formally document the narrowspec format. For bonus points, unify with the
56d4f88530fc narrow: update TODO.rst now that we share format with sparse
Martin von Zweigbergk <martinvonz@google.com>
parents: 40080
diff changeset
    10
server-specified narrowspec format.
36142
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
    11
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
    12
narrowrepo.setnarrowpats() or narrowspec.save() need to make sure
9b5df6e19a4f narrow: add a TODO document
Augie Fackler <augie@google.com>
parents:
diff changeset
    13
they're holding the wlock.
40088
1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core
Martin von Zweigbergk <martinvonz@google.com>
parents: 40081
diff changeset
    14
1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core
Martin von Zweigbergk <martinvonz@google.com>
parents: 40081
diff changeset
    15
The follinwg places do an unrestricted dirstate walk (including files outside the
1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core
Martin von Zweigbergk <martinvonz@google.com>
parents: 40081
diff changeset
    16
narrowspec). Some of them should perhaps not do that.
1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core
Martin von Zweigbergk <martinvonz@google.com>
parents: 40081
diff changeset
    17
1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core
Martin von Zweigbergk <martinvonz@google.com>
parents: 40081
diff changeset
    18
 * debugfileset
1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core
Martin von Zweigbergk <martinvonz@google.com>
parents: 40081
diff changeset
    19
 * perfwalk
1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core
Martin von Zweigbergk <martinvonz@google.com>
parents: 40081
diff changeset
    20
 * sparse (but restricted to sparse config)
1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core
Martin von Zweigbergk <martinvonz@google.com>
parents: 40081
diff changeset
    21
 * largefiles