On Sun, Mar 13, 2011 at 5:31 AM, Adrian Buehlmann <[email protected]> wrote: > On 2011-03-11 17:28, Steve Borho wrote: >> 2011/3/11 John Sparrow <[email protected]>: >>> 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"? >> >> I believe our graph algorithm will enforce this, yes. The >> "other/second" parent will be on the right. >> > > Sorry to rain on your parade, but I fear that's not the case. The > left-right/right-left ordering of the branch lines in the graph doesn't > correspond with the left arrows in the list of files in the revision > details pane. > > And I think I just found a proof for my claim. I uploaded a screenshot here: > > https://bitbucket.org/abuehl/downloads/downloads/thg-5749cde33f3b-merge-showall-1.PNG > > This screenshot was taken using > > "TortoiseHg version 2.0.2+14-5749cde33f3b with > Mercurial-1.8.1+2-8e94a1b4e9a4, Python-2.6.6, PyQt-4.8.3, Qt-4.7.1" > > on Windows 7 SP1 x64 as installed from a self built x64 msi package. > > As you can see in that screenshot, the merge with revision number 11040 > has a first parent 11034, which is connected with a plain vertical red > line on the *right* side in the graph, and a second parent 11039, which > comes from the *left* side in the graph from a short series of five blue > changeset nodes on the stable branch. > > In the file list you can see that "Show All" is enabled and you can see > the list of files below, all shown with a *left arrow* in front of the name. > > Now, let's for example look at the file about.py: This file change is > clearly coming from revision 11039 ("about: catch ValueError...."). That > file change "is coming" from the left side in the graph and "going to" > the right side in the graph. Yet, its arrow in the list of files points > to the left (!). > > The reason for all this is that the default branch is laid out on the > right side of the graph (in that screenshot). I can steer this by having > the working directory updated to the tip of the stable branch > (which you can't see in the screenshot, but that's what I did for that > screenshot). > > If I instead update to the tip of the default branch, then the graph > algorithm places the branches in the order default, stable (enumerating > the branches from left to right). The world is perfect then. > > So the key factor (using version 5749cde33f3b) is: on what branch the > user has set the working directory at the moment. If it's on default, > then Steve is right for that repo. If it's on stable, then he's wrong > for that repo. > > The repo in the example is the TortoiseHg repo itself.
I stand corrected. It seems we need better icons for "From 1st Parent", "From 2nd Parent" and "From Both Parents" -- Steve Borho ------------------------------------------------------------------------------ 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
