singhsrb updated this revision to Diff 1625.
singhsrb edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=1511=1625
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG67cfffbfb6a0: filemerge: eliminate most uses of tempfiles
(authored by phillco).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D399?vs=1508=1511#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE
phillco updated this revision to Diff 1508.
phillco edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=1486=1508
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
CHANGE
martinvonz added a comment.
In https://phab.mercurial-scm.org/D399#9522, @phillco wrote:
> Feel free to, otherwise I can. Thanks.
Done.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D399
To: phillco, #hg-reviewers
Cc: martinvonz, lothiraldan,
martinvonz added a comment.
Seems like you missed two places. Let me know if should fix them in flight
INLINE COMMENTS
> filemerge.py:426
> tool, toolpath, binary, symlink = toolconf
> a, b, c, back = files
> r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
why not change
phillco updated this revision to Diff 1486.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=1479=1486
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1479.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=1454=1479
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1304.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=1222=1304
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1222.
phillco edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=906=1222
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
CHANGE
phillco added a comment.
Fixed, thanks @lothiraldan :)
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D399
To: phillco, #hg-reviewers
Cc: lothiraldan, mercurial-devel
___
Mercurial-devel mailing list
lothiraldan added a comment.
Small typo in the commit message: s/remobe/remove
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D399
To: phillco, #hg-reviewers
Cc: lothiraldan, mercurial-devel
___
Mercurial-devel mailing
11 matches
Mail list logo