You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Augie Fackler <du...@gmail.com> on 2007/11/27 16:50:24 UTC
Re: Using hgmerge with 1.5's interactive conflict resolution
I submitted this a while ago, but all that came of it was discussing
the interface to the external merge tool. Does it make sense to
include this script in contrib, or should I just publish it on my own
hosting for now?
Peace,
Augie
(wanted to nudge this before 1.5 goes final)
On Oct 24, 2007, at 8:59 PM, Augie Fackler wrote:
> Hey all,
>
> In using Mercurial I noticed that hgmerge pretty much rocks across
> platforms for doing interactive merges, but the arguments it takes
> are somewhat different than ours. As such, I made a python wrapper
> for the hgmerge script, which is attached.
>
> I thought it should go in the contrib area so that people other than
> me will use it, since it's pretty handy. The the only major quirk as
> of now is that FileMerge on OS X doesn't seem to like writing to a
> tempfile that is a sibling of the conflicted file. I tried to
> diagnose that and in the end gave up and just used a temporary
> directory.
>
> If anyone has suggestions to improve the Python code, please let me
> know - I'm a bit new to doing file operations using Python.
>
> Peace,
> Augie Fackler
> [[[
> Add svn_hgmerge.py which wraps Mercurial's hgmerge script for use
> with the
> interactive conflict resolution system.
>
> * contrib/client-side/svn_hgmerge.py
> New file.
> ]]]
> <svn_hgmerge.py>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Using hgmerge with 1.5's interactive conflict resolution
Posted by Augie Fackler <du...@gmail.com>.
On Nov 28, 2007, at 12:51 AM, Karl Fogel wrote:
> Augie Fackler <du...@gmail.com> writes:
>>>> I submitted this a while ago, but all that came of it was
>>>> discussing
>>>> the interface to the external merge tool. Does it make sense to
>>>> include this script in contrib, or should I just publish it on my
>>>> own
>>>> hosting for now?
>>>
>>> Could you point to the original message in the archives, please?
>>> Thanks.
>>
>> Sure thing - http://svn.haxx.se/dev/archive-2007-10/1211.shtml
>
> Thanks, added in r28106. I changed it to "-" instead of "_", as a
> slight majority of our contrib scripts seem to use the former, and it
> doesn't involve a shift on most keyboards. Hope that's okay; if not,
> we can change it.
Cool. It shouldn't be a problem to have "-" instead of "_", the only
reason I can think of that'd matter would be if someone wanted to
import the script as a module, which doesn't make sense to me.
Thanks!
Augie
>
>
> -Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Using hgmerge with 1.5's interactive conflict resolution
Posted by Karl Fogel <kf...@red-bean.com>.
Augie Fackler <du...@gmail.com> writes:
>>> I submitted this a while ago, but all that came of it was discussing
>>> the interface to the external merge tool. Does it make sense to
>>> include this script in contrib, or should I just publish it on my own
>>> hosting for now?
>>
>> Could you point to the original message in the archives, please?
>> Thanks.
>
> Sure thing - http://svn.haxx.se/dev/archive-2007-10/1211.shtml
Thanks, added in r28106. I changed it to "-" instead of "_", as a
slight majority of our contrib scripts seem to use the former, and it
doesn't involve a shift on most keyboards. Hope that's okay; if not,
we can change it.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Using hgmerge with 1.5's interactive conflict resolution
Posted by Augie Fackler <du...@gmail.com>.
On Nov 27, 2007, at 6:09 PM, Karl Fogel wrote:
> Augie Fackler <du...@gmail.com> writes:
>> I submitted this a while ago, but all that came of it was discussing
>> the interface to the external merge tool. Does it make sense to
>> include this script in contrib, or should I just publish it on my own
>> hosting for now?
>
> Could you point to the original message in the archives, please?
> Thanks.
Sure thing - http://svn.haxx.se/dev/archive-2007-10/1211.shtml
>> (wanted to nudge this before 1.5 goes final)
>
> No need to worry; contrib scripts can be added after branching.
Ah, excellent.
Augie
>
>
> -Karl
>
>> On Oct 24, 2007, at 8:59 PM, Augie Fackler wrote:
>>
>>> Hey all,
>>>
>>> In using Mercurial I noticed that hgmerge pretty much rocks across
>>> platforms for doing interactive merges, but the arguments it takes
>>> are somewhat different than ours. As such, I made a python wrapper
>>> for the hgmerge script, which is attached.
>>>
>>> I thought it should go in the contrib area so that people other than
>>> me will use it, since it's pretty handy. The the only major quirk as
>>> of now is that FileMerge on OS X doesn't seem to like writing to a
>>> tempfile that is a sibling of the conflicted file. I tried to
>>> diagnose that and in the end gave up and just used a temporary
>>> directory.
>>>
>>> If anyone has suggestions to improve the Python code, please let me
>>> know - I'm a bit new to doing file operations using Python.
>>>
>>> Peace,
>>> Augie Fackler
>>> [[[
>>> Add svn_hgmerge.py which wraps Mercurial's hgmerge script for use
>>> with the
>>> interactive conflict resolution system.
>>>
>>> * contrib/client-side/svn_hgmerge.py
>>> New file.
>>> ]]]
>>> <svn_hgmerge.py>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Using hgmerge with 1.5's interactive conflict resolution
Posted by Karl Fogel <kf...@red-bean.com>.
Augie Fackler <du...@gmail.com> writes:
> I submitted this a while ago, but all that came of it was discussing
> the interface to the external merge tool. Does it make sense to
> include this script in contrib, or should I just publish it on my own
> hosting for now?
Could you point to the original message in the archives, please?
Thanks.
> (wanted to nudge this before 1.5 goes final)
No need to worry; contrib scripts can be added after branching.
-Karl
> On Oct 24, 2007, at 8:59 PM, Augie Fackler wrote:
>
>> Hey all,
>>
>> In using Mercurial I noticed that hgmerge pretty much rocks across
>> platforms for doing interactive merges, but the arguments it takes
>> are somewhat different than ours. As such, I made a python wrapper
>> for the hgmerge script, which is attached.
>>
>> I thought it should go in the contrib area so that people other than
>> me will use it, since it's pretty handy. The the only major quirk as
>> of now is that FileMerge on OS X doesn't seem to like writing to a
>> tempfile that is a sibling of the conflicted file. I tried to
>> diagnose that and in the end gave up and just used a temporary
>> directory.
>>
>> If anyone has suggestions to improve the Python code, please let me
>> know - I'm a bit new to doing file operations using Python.
>>
>> Peace,
>> Augie Fackler
>> [[[
>> Add svn_hgmerge.py which wraps Mercurial's hgmerge script for use
>> with the
>> interactive conflict resolution system.
>>
>> * contrib/client-side/svn_hgmerge.py
>> New file.
>> ]]]
>> <svn_hgmerge.py>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org