I'm fairly new to Kiln + Mercurial, but recently I started creating branch repositories and modifying my source from two computers. After a few commits, I noticed lines/graphs on the history view in Kiln, along with commits labeled "Automated Merge with ..." that I'm struggling to understand.
Note: This pic is from the main repository. It has never had any merges from the branch repository, so everything here (eg. all the automated merges) are from the same repository. I blanked out any potentially-sensitive stuff, but hopefully there's still enough info for the questions.
So, the Yellow line, I think I understand. I have a second copy of the repository on my work machine. I updated a readme on it, and I reckon that I did a commit back on my Mac before I did a fetch. This would be why the "Updated doc" seems to merge in after another commit from my Mac.
I'd also guess, that I didn't fetch from my work machine for ages - and the "Updated readme" (also on my work machine) was done in a stale copy, which was again merged in after many other commits with a fetch on my home Mac.
The questions I have are:
What are the red and light blue lines? I've only ever hard two copies of the repo - one on my Mac, and one on my work machine. How can I have all of these "parallel streams"? I believe all changes on the "main line", the light blue and the red where all done in the same repository.
What are these "Automated merge with..." lines? If I view the changes, they look like changes I've made, but I would've thought all of my changes would appear along with the comment I entered when I committed. These merges make it look like I've made changes without entering proper comments.