This is an archive of the discontinued Mercurial Phabricator instance.

shelve: add --unresolved flag to shelve mergestate with unresolved files
Needs RevisionPublic

Authored by navaneeth.suresh on Aug 17 2019, 4:38 PM.


Group Reviewers

Until now, shelve used to abort on trying to shelve a mergestate.
This patch adds an --unresolved flag to shelve and use the changeset
extras to store the mergestate.

After shelving, and the working directory is updated to p1().

hg shelve will abort when:

  1. No merge is active on calling with --unresolved.
  2. No unresolved files found in active merge on calling with --unresolved.
  3. Merge is active on calling without --unresolved.

Diff Detail

rHG Mercurial
Lint Skipped
Unit Tests Skipped

Event Timeline

baymax requested changes to this revision.Jan 24 2020, 12:31 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.


This revision now requires changes to proceed.Jan 24 2020, 12:31 PM