hg merge results into linear dag
Created originally on Bitbucket by dpsenner (Dominik P)
We use branches to keep track of bug related fixes. Since tortoisehg 2.0.0 this results into a linear dag: {{{ #!bash $ hg glog -l 4 @ changeset: 1728:e09f5f1072dc | tag: tip | user: DominikP | date: Tue Mar 15 14:39:52 2011 +0100 | summary: Merge BUG into default | o changeset: 1727:bb9b106379fb | branch: BUG | user: DominikP | date: Tue Mar 15 14:36:00 2011 +0100 | summary: fixed BUG | o changeset: 1726:e5c458724d91 | branch: BUG | user: DominikP | date: Tue Mar 15 14:35:45 2011 +0100 | summary: something else | o changeset: 1725:63237bbfb0b2 | user: DominikP | date: Tue Mar 15 13:16:20 2011 +0100 | summary: something | }}}
Instead I would expect the DAG to become something like: {{{ #!bash $ hg glog -l 4 @ changeset: 1728:e09f5f1072dc |\ tag: tip | | user: DominikP | | date: Tue Mar 15 14:39:52 2011 +0100 | | summary: Merge BUG into default | | | o changeset: 1727:bb9b106379fb | | branch: BUG | | user: DominikP | | date: Tue Mar 15 14:36:00 2011 +0100 | | summary: fixed BUG | | | o changeset: 1726:e5c458724d91 | | branch: BUG | | user: DominikP | | date: Tue Mar 15 14:35:45 2011 +0100 | | summary: something else |/ o changeset: 1725:63237bbfb0b2 | user: DominikP | date: Tue Mar 15 13:16:20 2011 +0100 | summary: something | }}}
Actually I believe that this bug is probably misplaced here and should be reported to HG instead.