On Thu, Jun 10, 2010 at 12:07 AM, Richard
<[email protected]> wrote:
> With TortoiseSVN, when I did a visual diff on a file, my working copy
> was writable, allowing me to modify the working file to undo unwanted
> changes and so-on.
>
> With TortoiseHg, visual diffs treat my working copy as read-only,
> making it impossible for me to modify the working copy using the
> previous version as a reference.
>
> I have both SVN and Hg configured to use Beyond Compare 2 as my visual
> diff engine.
>
> Is it possible to change thg to stop using the working copy as read-only?

add the following two lines (ignore line wrapping) to your user
Mercurial.ini file:

[merge-tools]
beyondcompare3.diffargs=/lefttitle='$plabel1' /righttitle='$clabel'
/solo /expandall $parent $child

The default TortoiseHg config file uses a command with /lro which
tells BeyondCompare to mark the right side read-only.  Which now that
I look at it seems wrong.  That should probably be /llo since it is
the parent revision which is not modifiable, but I don't have a copy
of BeyondCompare in front of me to verify that with.

-- 
Steve Borho

------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss

Reply via email to