CODEWITHSUNDEEP
version-controlmercurialversiontortoisehg
kosnkov
kosnkov

Reputation: 5941

Tortoise Hg red line after merging

Hi after merging i have this red line what does it mean? enter image description here

Upvotes: 4

Views: 1054

Answers (1)

Christian Specht
Christian Specht

Reputation: 36431

The graph view on the left shows your different branches of development, e.g. different sets of changes (probably done by different people):

Person A made changes at revision 17, 20 and 25.
Person B (or the rest of the team) made the other changes...and at some point the changes have to be merged together again.

The different line colors are just for clarity, and the colors are assigned randomly, I think.
(see the TortoiseHG docs for a screenshot with more lines)

In your example, the blue and red line connecting at revision 26 means that you (or someone else) merged revisions 24 and 25 (the blue dots where the lines come from).

The same happened at revision 24, where revision 20 and 23 were merged.

The fact that you are asking this shows me that the concept of branching and merging in Mercurial (or any VCS) seems to be new to you.
Maybe you should read a bit about branching and merging. Here are some good tutorials:

Upvotes: 5

Related Questions