Thanks for the clarification.
Also when you press 'show all' it's quite confusing which parent the change
came from. Perhaps a tooltip showing the rev number?
Or do the arrows correspond to the graph layout, ie an arrow pointing left
means "This change came from the right-hand parent, as currently shown in the
graph"?
From: [email protected]
To: [email protected]
CC: [email protected]
Subject: Re[2]: [thg] Merged revisions
Date: Fri, 11 Mar 2011 12:42:48 +0300
This is probably a bug. I can think about a workaround though: you can just
explicitly visual diff the two necessary revisions (selecting both and then do
the diff).
Fri, 11 Mar 2011 09:38:34 +0000 письмо от John Sparrow
<[email protected]>:
Ahh thanks for the explaination!
How does the visual diff work? If I have rev 602 (merging 600 and 601)
selecting visual diff on any file just compares 600 with 602, regardless of
parent.
From: [email protected]
To: [email protected]
CC: [email protected]
Subject: Re: [thg] Merged revisions
Date: Fri, 11 Mar 2011 12:27:28 +0300
There are two buttons just above the file list for a merge revision: 'Show All'
and 'Other'. By default both buttons are switched off. In this state only files
that had conflicts (differ from both parents) are shown in the file list and
diff wrt the first parent is shown. If you press 'Other' button you will see
the same diff wrt the other parent. If you press 'Show All' it will show all
files that are different from at least one of the parents. Each file name has
an arrow next to it to show the parent it came from.
I have this behavior both under Linux and Windows for 2.0 and 2.0.2.
Fri, 11 Mar 2011 08:50:53 +0000 письмо от John Sparrow
<[email protected]>:
Can someone explain to me how the Workbench works for merged revisions??
The file list on the left hand side doesn't show the changed files, and there
is no way I can see to switch to the other parent. If I double click on the
merge revision I get a list of files, but the 'Diff to p1' and 'Diff to p2'
buttons are disabled.
Help!
Same for (2.0.0 and 2.0.2)
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
