This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc0439e11af16: filemerge: fix backing up an in-memory file
to a custom location (authored by phillco, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org
phillco updated this revision to Diff 4699.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1806?vs=4697&id=4699
REVISION DETAIL
https://phab.mercurial-scm.org/D1806
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerg
phillco updated this revision to Diff 4697.
phillco edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1806?vs=4688&id=4697
REVISION DETAIL
https://phab.mercurial-scm.org/D1806
AFFECTED FILES
mercurial/filemerge.py
CH
phillco added a comment.
> Should we even be calling _makebackup in the case of an inmemory merge?
Like, maybe the makebackup should be conditional based on if the source file
context is actually a workingctx?
The merge process itself uses the backup, it's not just for the user.
INLINE
durham accepted this revision.
durham added a comment.
Accepting, since it seems more correct than before.
Should we even be calling _makebackup in the case of an inmemory merge?
Like, maybe the makebackup should be conditional based on if the source file
context is actually a workingct
On Thu, Jan 04, 2018 at 07:36:55PM +, phillco (Phil Cohen) wrote:
> phillco created this revision.
> Herald added a subscriber: mercurial-devel.
> Herald added a reviewer: hg-reviewers.
>
> REVISION SUMMARY
> If the user specifies a ui.origbackuppath, we used to always copy the file
> ther
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
If the user specifies a ui.origbackuppath, we used to always copy the file
there, but if the source file is in memory we must write it instead of
copying.
REPOSI
