CODEWITHSUNDEEP
mercurialrepositorybranching-and-mergingdvcs
Display Name
Display Name

Reputation: 2403

I don't understand this Mercurial branching

A coworker ended up with the Mercurial history shown below (cropped screenshot from TortoiseHg). Being pretty new to Hg, neither of us understands what's going on. How is it that the rightmost sequence has a branch name varying over time? Unfortunately, I don't know the exact process by which he ended up like this, let alone how to sort this out. enter image description here

Upvotes: 0

Views: 49

Answers (1)

Lazy Badger
Lazy Badger

Reputation: 97280

How is it that the rightmost sequence has a branch name varying over time?

Easy. Everybody can change branch, on which will refer the next commit, use any amount branches and switch between them.

I, personally, can't see now any reasons for pure linear history with changing branches (for current DAG merging 356 into mainline will merge all ancestors from all parent's branches), but - WIP is WIP... and I can expect at least rebasing two named branches into some (new) branchpoint and branch-names of changesets will help to identify in this case content of diverged histories

Upvotes: 1

Related Questions