On Mon, Feb 24, 2014 at 8:44 AM, Peer Sommerlund <[email protected]>
wrote:
>
>
> The only situation I can think of where you are allowed to merge
> with an ancestor, is if the ancestor is on a different merged branch.
> Is that the case here?
> Could you provide a screenshot that also shows named branch for each
cset?
Sure, i'll do it later today.
But before that I'd like to make sure we're on the same page:
the screenshot http://i.imgur.com/vqknt3B.png
refers to the history of a -single- file, not a complete repository.
Which is, edges mean "ancestor" and not merely "parent".
So, two edges going into a node don't directly mean "a merge happened".
The merge has been done, but possibly between nodes not shown
in the reduced DAG limited to a single file's history.
GGhh
------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
