|
Size: 1132
Comment:
|
← Revision 5 as of 2015-11-17 18:25:59 ⇥
Size: 1133
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 20: | Line 20: |
| The following table lists what additional data has been introduced to the merge state | The following table lists what additional data has been introduced to the merge state: |
Merge State Records
Handling unsupported merge state records.
1. Mercurial pointed me to this page. Help!
tl;dr: abort the merge (hg update --clean, hg rebase --abort, etc), or upgrade to the latest version of Mercurial.
2. What is a merge state record?
The merge state stores the state of a paused merge on disk. This includes
- what commits are being merged
- what files have been resolved
New versions of Mercurial may store additional data in the merge state. This data will cause older versions of Mercurial to abort. This only happens when a newer version of Mercurial starts a merge (via hg merge, hg rebase etc) and an older version of Mercurial is used to continue the merge on the same disk or network filesystem.
The following table lists what additional data has been introduced to the merge state:
Additional data
Compatible versions
Description
C
>= 3.7
Change/delete conflicts
D
>= 3.7
Files automatically resolved by merge driver (see MergeDriverPlan)