Manual merge for some files during rebase (using TortoiseHg)

[Steve Borho]

On Thu, Oct 29, 2009 at 7:19 PM, Benoit Boissinot
<benoit.boissinot at ens-lyon.org> wrote:
> On Mon, Oct 26, 2009 at 10:56:55AM +0800, Afriza N. Arief wrote:
>> Hi,
>>
>> I have project files within my repository (let's say *.proj), unfortunately,
>> the order of the (text) content is not consistent and if I use Kdiff3 (which
>> is the default since I'm using TortoiseHg's installer) to merge, it can
>> easily lead to corrupted project file. So what I do during a merge is to
>> take a good copy from one side, try to compile the projects, and fix the
>> project's settings using IDE.
>>
>> However, when I do rebase, it automatically commits when I "Choose B
>> everywhere", save, and close KDiff3. Is there any settings or flags I can
>> pass to hg rebase such that I can review and fix some stuffs before
>> committing it?
>
> I'm sorry, I don't know. Maybe you'll have more luck asking directly in
> the THG mailing list?
>
> http://bitbucket.org/tortoisehg/stable/wiki/Home#mailing-lists

I think this is a straight-forward merge/rebase question.   Rebase
uses Mercurial's merge machinery so you should be able to get the
behavior you want by creating well tweaked [merge-patterns] and
[merge-tools] ini sections.

This may cause a rebase to be interrupted, though, requiring you to
finish it on the command line.

--
Steve Borho