126 Redo merge with merge.preferancestor="*" to enable bid merge

   127 

   128   $ rm f*

   129   $ hg up -qC .

   130   $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*"

   131   

   132   calculating bids for ancestor 0f6b37dbe527

   133     searching for copies back to rev 3

   134   resolving manifests

   135    branchmerge: True, force: False, partial: False

   136    ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922

   137    f1: g

   138    f2: m

   139   

   140   calculating bids for ancestor 40663881a6dd

   141     searching for copies back to rev 3

   142   resolving manifests

   143    branchmerge: True, force: False, partial: False

   144    ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922

   145    f1: m

   146    f2: k

   147   

   148   auction for merging merge bids

   149    f1: picking 'get' action

   150    f2: picking 'keep' action

   151   end of auction

   152   

   153    f1: remote is newer -> g

   154    f2: keep -> k

   155   getting f1

   156   updating: f1 1/1 files (100.00%)

   157   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   158   (branch merge, don't forget to commit)

   159 

   160   $ head *

   161   ==> f1 <==

   162   5 second change

   163   

   164   ==> f2 <==

   165   6 second change

   166 

   167 

   168 The other way around:

   169 

   170   $ hg up -C -r5

   171   note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922

   172         alternatively, use --config merge.preferancestor=40663881a6dd

   173   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

   174   $ hg merge -v --debug --config merge.preferancestor="*"

   175   

   176   calculating bids for ancestor 0f6b37dbe527

   177     searching for copies back to rev 3

   178   resolving manifests

   179    branchmerge: True, force: False, partial: False

   180    ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5

   181    f1: k

   182    f2: m

   183   

   184   calculating bids for ancestor 40663881a6dd

   185     searching for copies back to rev 3

   186   resolving manifests

   187    branchmerge: True, force: False, partial: False

   188    ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5

   189    f1: m

   190    f2: g

   191   

   192   auction for merging merge bids

   193    f1: picking 'keep' action

   194    f2: picking 'get' action

   195   end of auction

   196   

   197    f1: keep -> k

   198    f2: remote is newer -> g

   199   getting f2

   200   updating: f2 1/1 files (100.00%)

   201   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   202   (branch merge, don't forget to commit)

   203 

   204   $ head *

   205   ==> f1 <==

   206   5 second change

   207   

   208   ==> f2 <==

   209   6 second change

   210 

   211 Verify how the output looks and and how verbose it is:

   212 

   213   $ hg up -qC

   214   $ hg merge --config merge.preferancestor="*"

   215   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   216   (branch merge, don't forget to commit)

   217 

   218   $ hg up -qC

   219   $ hg merge -v --config merge.preferancestor="*"

   220   

   221   calculating bids for ancestor 0f6b37dbe527

   222   resolving manifests

   223   

   224   calculating bids for ancestor 40663881a6dd

   225   resolving manifests

   226   

   227   auction for merging merge bids

   228    f1: picking 'get' action

   229    f2: picking 'keep' action

   230   end of auction

   231   

   232   getting f1

   233   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   234   (branch merge, don't forget to commit)

   235 

   236   $ hg up -qC

   237   $ hg merge -v --debug --config merge.preferancestor="*"

   238   

   239   calculating bids for ancestor 0f6b37dbe527

   240     searching for copies back to rev 3

   241   resolving manifests

   242    branchmerge: True, force: False, partial: False

   243    ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922

   244    f1: g

   245    f2: m

   246   

   247   calculating bids for ancestor 40663881a6dd

   248     searching for copies back to rev 3

   249   resolving manifests

   250    branchmerge: True, force: False, partial: False

   251    ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922

   252    f1: m

   253    f2: k

   254   

   255   auction for merging merge bids

   256    f1: picking 'get' action

   257    f2: picking 'keep' action

   258   end of auction

   259   

   260    f1: remote is newer -> g

   261    f2: keep -> k

   262   getting f1

   263   updating: f1 1/1 files (100.00%)

   264   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   265   (branch merge, don't forget to commit)

   266