On Mon, Jan 12, 2009 at 12:16 AM, Peer Sommerlund <[email protected]
> wrote:
>
>
> 2009/1/12 Steve Borho <[email protected]>
>
> Hi TK, I've heard you mention a couple of times you've done some
>> preliminary work on this feature. Is this available for pulling?
>>
>> I've been staring at the record.py extension that BOS wrote and I
>> think it would be fairly easy to support per-hunk change selection
>> using this code directly (a finer degree of control than the per-range
>> change selection dialog that Qct provides).
>>
>> I was amused that he used nearly the same method as Qct did to
>> manage the modified files and their backups, so that should port
>> easily to THG.
>>
>> The biggest remaining question is what the user interface should
>> look like. I think we still want to use the commit tool itself to select
>> entire files for inclusion into the changeset. I also think a separate
>> dialog for hunk/range selection is a good idea, since it modifies the
>> file in your working copy. You want it to be an explicit process.
>>
>> So, how do we display all of the changes in a file in such a way that
>> individual changes can be "held out of the commit"? And how do we
>> display changes that have been held out? Do we allow hunks to be
>> edited?
>>
>
> Are you sure the commit tool should do it?
> How about calling the merge tool, starting with two files "no changes" and
> "all changes" and merging into the third file "selected changes"
>
> This saves a lot of developer time and gives the user a choice of gui
> (kdiff3 / winmerge / whatever).
>
Qct took this approach before it had a built-in change selection dialog.
The problem is that none of the merge tools were all that good at it, and it
was somewhat confusing to use.
It's surprisingly easy to implement, though.
--
Steve
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
