Question

I'm using Source Tree for managing my code versions on Bit Bucket. I'm using Mercurial repositories. I have two branches for now, the default and the develop branch. The problem starts when I try to merge the changes from the develop branch into the default branch. Here are the two images of the current tree:

Problematic tree Correct tree

I did some development in develop branch and merged it all to the default branch. now I have some stuff to check in the develop again. When I want to check it in, the tree coloring changes in weird fashion.

The right side picture displays the correct coloring of the tree. The default branch is the oldest and starting branch. The develop is branched out after six commits. I initially commited some stuff there before I decided to do a better job of keeping my versions. The problem is when I change my current active branch to develop (left side image), Source Tree decides to display the develop branch as oldest. If you look at the images, the develop is set next to a violet dot and default is set next to a blue dot, which makes it seem the default was branched out of develop at flow initialization, which is simply not true.

Can anyone explain what is going on here? How could I keep my oldest (default) branch colored as it should be?

Était-ce utile?

La solution

In terms of (colored) graph, the two screenshots you posted are similar, except for the very top part: "Uncommited changes" is attached to the tip of develop, and the tip of default, respectively.

The left-most branch is the current branch (i.e. the checked-out branch), not the oldest branch. If you think this behaviour should change, the best thing to do is to open an issue on Atlassian's JIRA for SourceTree (or here for the Mac version).

Licencié sous: CC-BY-SA avec attribution
Non affilié à StackOverflow
scroll top