This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc0ce60459d84: merge: pass wctx to premerge, filemerge
(authored by phillco, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D449?vs=1670=1768
quark accepted this revision.
quark added a comment.
This looks safe to me.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D449
To: phillco, #hg-reviewers, quark
Cc: quark, mercurial-devel
___
Mercurial-devel mailing
phillco added a comment.
I thought this wasn't needed, but it is.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D449
To: phillco, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
phillco updated this revision to Diff 1670.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D449?vs=1298=1670
REVISION DETAIL
https://phab.mercurial-scm.org/D449
AFFECTED FILES
hgext/largefiles/overrides.py
mercurial/filemerge.py
mercurial/merge.py
phillco requested review of this revision.
phillco added a comment.
It's now back in the stack.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D449
To: phillco, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel
phillco planned changes to this revision.
phillco added a comment.
Will reintroduce later, closer to changes further up the stack.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D449
To: phillco, #hg-reviewers
Cc: mercurial-devel
phillco updated this revision to Diff 1298.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D449?vs=1236=1298
REVISION DETAIL
https://phab.mercurial-scm.org/D449
AFFECTED FILES
hgext/largefiles/overrides.py
mercurial/filemerge.py
mercurial/merge.py
phillco updated this revision to Diff 1236.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D449?vs=1235=1236
REVISION DETAIL
https://phab.mercurial-scm.org/D449
AFFECTED FILES
hgext/largefiles/overrides.py
mercurial/filemerge.py
mercurial/merge.py
phillco updated this revision to Diff 1235.
phillco edited the summary of this revision.
phillco retitled this revision from "merge: pass `wctx` object to `premerge()`
and `filemerge`" to "merge: pass wctx to premerge, filemerge".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
phillco added a comment.
Not sure if I phabsent this correctly, but this shouldn't have any
dependencies.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D449
To: phillco, #hg-reviewers
Cc: mercurial-devel
___
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D449
AFFECTED FILES
hgext/largefiles/overrides.py
mercurial/filemerge.py
mercurial/merge.py
11 matches
Mail list logo