Should this also be the case when double-clicking on a single file inside a
changeset? (I emailed you a short screencapture showing you what I mean)
It seems a bit counter-intuitive. I've picked a specific parent (via the
tick-box) and a specific file, so it's it just a 2-way diff?
Thanks,
> Date: Wed, 10 Mar 2010 09:03:23 -0600
> Subject: Re: [thg] Problem with visual diff after merge
> From: [email protected]
> To: [email protected]
> CC: [email protected]
>
> On Wed, Mar 10, 2010 at 7:12 AM, John Sparrow
> <[email protected]> wrote:
> >
> > In v1.0, repos explorer, following a merge, if you tick 'diff to second
> > parent' the correct set of file changes is shown. However if you double
> > click to open TMerge (or whatever), a diff with the *original* parent is
> > performed!
>
> Unless your merge tool supports 3way directory diffs, the expected
> behavior is for the visual diff window to be opened. The visual diff
> window will have buttons for directory diffs to either parent.
> This assumes your tool can do directory diffs. If it can only do
> single file diffs, the only way to visualize the second parent changes
> is to explicitly ask for changes between the merge changeset and the
> second parent using the 'visual Diff with selected' changeset context
> menu.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
