D348: rebase: change internal format to support destination map

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Tue Aug 29 18:13:01 EDT 2017


martinvonz added inline comments.

INLINE COMMENTS

> quark wrote in rebase.py:191-193
> I think you mean "read" instead of "write".
> 
> The old client will crash reading the state file. Even if they do not crash, they cannot figure out what to do correctly because they don't have multi-dest support. So I don't think any attempt to make the format compatible with old client is worthwhile.
> 
> Looking at https://phab.mercurial-scm.org/rHG5eac7ab59b95e5c2dc8dd6a268a51c49540fcbeb, https://phab.mercurial-scm.org/rHG92409f8dff5d0d6d0b6c73653b2e356eac5679bc, https://phab.mercurial-scm.org/rHG72412afe4c2872fc3197aeee06f6841c76e19772, the file format has been changed a few times in recent years. So I disagree with Mads Kiilerich and don't think this patch needs change.
> 
> If you think perfect compatibility (sane error message) in both directions is a must have, I can add a repo requirement.

I also don't think it's reasonable to make it possible for old versions to continue the rebase, but I'd like them to at least be able to run "hg rebase --abort". Could you make sure that's possible?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D348

To: quark, #hg-reviewers
Cc: martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list