Page MenuHomePhabricator

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

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

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

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped