[RFC] two improvements to mercurial

[Jordan Breeding]

On Aug 29, 2005, at 20:26 , Bryan O'Sullivan wrote:

> On Mon, 2005-08-29 at 19:34 -0500, Jordan Breeding wrote:
>
> That's a problem.  Perhaps you can script something up that waits for
> the spawned FileMerge to exit.  This something will need to exit with
> non-zero status if FileMerge fails or doesn't complete a merge.
>
> By the way, there's a binary of kdiff3 available for the Mac.  You
> should give it a try; it appears to be much better than FileMerge.
>

I am attaching a rudimentary patch to add support for using FileMerge  
only on Darwin and only when FileMerge exists in its default  
location.  I tried looking at kdiff3 and at least for my uses they  
seem similar, so I prefer to use FileMerge since I have used it a  
little before.

>
>> 2) The other idea I have I am going to start implementing within the
>> next week or two.  The idea is to have better support for converting
>> cvs to mercurial.  Currently one can try to use tailor but I have not
>> had the greatest experience while trying to get tailor 0.99 working.
>>
>
> You should talk to Lele Gaifax about that, then; he's often on #tailor
> on irc.freenode.net, and there's a tailor mailing list, too.  He's  
> very
> responsive and helpful.
>

I will try getting in touch with him a little later this week.

>
>> If 2) is
>> worthwhile then I will start on it as soon as I can.
>>
>
> I think that #2 is of dubious value.  If you help Lele by sending bug
> reports or fixes for tailor, then more SCM users benefit than if you
> hack git-cvsimport-script to work with Mercurial.
>
> The ne plus ultra of CVS importers appears to be Subversion's.  A  
> thing
> of great value would probably be to adapt that into tailor, so that it
> could parse CVS files directly with local access to the CVS root.   
> This
> would speed up the import process by several orders of magnitude.
>
> In a similar vein, adapting tailor so that it uses the Mercurial APIs
> directly to perform commits, instead of forking for every commit,  
> would
> also speed imports up a lot, and would benefit people migrating from
> other SCMs.
>
>     <b
>
>

Yes, cvs2svn does a pretty good job of converting my repo, but  
honestly the git script does just about as well.  I still need to do  
some basic verification and get one bug I have run into fixed, but so  
far it looks pretty good.  The main advantage to having a script such  
as the git script would be speed until other solutions become more  
robust, if I can achieve the type of speed the git script has with a  
similar mercurial script then it will be one of the fastest cvs  
conversions I have used.  Tailor takes a long time, cvs2svn even  
takes a while, but git's script is really quite fast.

Sorry, I don't know what type of inlining or attaching the mercurial  
mailing list normally uses, so I will just hope that Mail.app gets my  
attachment to you in a useable format.

Jordan

-------------- next part --------------
A non-text attachment was scrubbed...
Name: hg_add_os_x_merging.diff
Type: application/octet-stream
Size: 587 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial/attachments/20050829/e4500f70/hg_add_os_x_merging.obj