[Commented On] D10703: Fix hgext/convert/p4.py for Python 3
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Mon May 10 04:51:56 UTC 2021
mharbison72 added a comment.
In D10703#162605 <https://phab.mercurial-scm.org/D10703#162605>, @nate wrote:
> Thanks for the info.
> I created the diff outside of hg (on direct source archives); mostly `diff -ur a b`... `[hg] patch -p1` should make it apply (maybe `-u` for unified or the equivalent hg option).
The problem turned out to be this line in the diff with an extra `a/` and `b/`:
`diff --git a/a/hgext/convert/p4.py b/b/hgext/convert/p4.py`
No big deal, `sed` was able to fix it.
> I appreciate your follow through getting this in.
Thanks for the patch, it should be in the next point release. Since you're messing with p4 stuff, do you happen to use the perfarce extension? I was thinking about removing support from TortoiseHg since I don't see a modern version of it, and assumed nobody uses it anymore.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D10703/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D10703
To: nate, #hg-reviewers, mharbison72
Cc: mharbison72, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210510/abf4eeeb/attachment-0002.html>
More information about the Mercurial-patches
mailing list