283 

   284 Testing --publish interaction with multiple head detection

   285 ============================================================

   286 

   287 pushing a topic changeset, publishing it

   288 ----------------------------------------

   289 

   290   $ hg topic topic_A

   291   marked working directory as topic: topic_A

   292   $ mkcommit c_dK0

   293   active topic 'topic_A' grew its first changeset

   294   $ hg push -r 'desc("c_dK0")' --publish

   295   pushing to $TESTTMP/bare-branch-server

   296   searching for changes

   297   adding changesets

   298   adding manifests

   299   adding file changes

   300   added 1 changesets with 1 changes to 1 files

   301   active topic 'topic_A' is now empty

   302   $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'

   303   @  11:d06fc4f891e8 c_dK0 public default

   304   |

   305   o  10:ac4cf59f2aac c_dJ0 public default

   306   |

   307   o  9:fbf2be276221 c_dI0 public default

   308   |

   309   o  5:5576ae39eaee c_dE0 public default

   310   |

   311   | o  8:8e85646c135f c_oH0 draft other

   312   | |

   313   | o  7:d293f74a1233 c_oG0 public other

   314   | |

   315   | o  6:45b23c834b6a c_oF0 public other

   316   |/

   317   o  4:c63e7dd93a91 c_dD0 public default

   318   |

   319   o  3:7d56a56d2547 c_dC0 public default

   320   |

   321   o  2:286d02a6e2a2 c_dB0 public default

   322   |

   323   o  1:134bc3852ad2 c_dA0 public default

   324   |

   325   o  0:ea207398892e ROOT public default

   326   

   327 

   328 pushing a new branch, alongside an existing topic

   329 -------------------------------------------------

   330 

   331   $ hg topic topic_A

   332   $ mkcommit c_dL0

   333   active topic 'topic_A' grew its first changeset

   334   $ hg push -r 'desc("c_dL0")'

   335   pushing to $TESTTMP/bare-branch-server

   336   searching for changes

   337   adding changesets

   338   adding manifests

   339   adding file changes

   340   added 1 changesets with 1 changes to 1 files

   341   $ hg update 'desc("c_dK")'

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

   343   $ mkcommit c_dM0

   344   $ hg push -r 'desc("c_dM0")' --publish

   345   pushing to $TESTTMP/bare-branch-server

   346   searching for changes

   347   adding changesets

   348   adding manifests

   349   adding file changes

   350   added 1 changesets with 1 changes to 1 files (+1 heads)

   351   $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'

   352   @  13:0d144c8b6c8f c_dM0 public default

   353   |

   354   | o  12:3c73f6cabf07 c_dL0 draft default topic_A

   355   |/

   356   o  11:d06fc4f891e8 c_dK0 public default

   357   |

   358   o  10:ac4cf59f2aac c_dJ0 public default

   359   |

   360   o  9:fbf2be276221 c_dI0 public default

   361   |

   362   o  5:5576ae39eaee c_dE0 public default

   363   |

   364   | o  8:8e85646c135f c_oH0 draft other

   365   | |

   366   | o  7:d293f74a1233 c_oG0 public other

   367   | |

   368   | o  6:45b23c834b6a c_oF0 public other

   369   |/

   370   o  4:c63e7dd93a91 c_dD0 public default

   371   |

   372   o  3:7d56a56d2547 c_dC0 public default

   373   |

   374   o  2:286d02a6e2a2 c_dB0 public default

   375   |

   376   o  1:134bc3852ad2 c_dA0 public default

   377   |

   378   o  0:ea207398892e ROOT public default

   379   

   380 

   381 pushing a topic (publishing) alongside and existing branch head

   382 ---------------------------------------------------------------

   383 

   384   $ hg update 'desc("c_dK")'

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

   386   $ hg topic topic_B

   387   marked working directory as topic: topic_B

   388   $ mkcommit c_dN0

   389   active topic 'topic_B' grew its first changeset

   390   $ hg push -r 'desc("c_dN0")' --publish

   391   pushing to $TESTTMP/bare-branch-server

   392   searching for changes

   393   abort: push creates new remote head 4dcd0be9db96!

   394   (merge or see 'hg help push' for details about pushing new heads)

   395   [255]

   396   $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'

   397   @  14:4dcd0be9db96 c_dN0 draft default topic_B

   398   |

   399   | o  13:0d144c8b6c8f c_dM0 public default

   400   |/

   401   | o  12:3c73f6cabf07 c_dL0 draft default topic_A

   402   |/

   403   o  11:d06fc4f891e8 c_dK0 public default

   404   |

   405   o  10:ac4cf59f2aac c_dJ0 public default

   406   |

   407   o  9:fbf2be276221 c_dI0 public default

   408   |

   409   o  5:5576ae39eaee c_dE0 public default

   410   |

   411   | o  8:8e85646c135f c_oH0 draft other

   412   | |

   413   | o  7:d293f74a1233 c_oG0 public other

   414   | |

   415   | o  6:45b23c834b6a c_oF0 public other

   416   |/

   417   o  4:c63e7dd93a91 c_dD0 public default

   418   |

   419   o  3:7d56a56d2547 c_dC0 public default

   420   |

   421   o  2:286d02a6e2a2 c_dB0 public default

   422   |

   423   o  1:134bc3852ad2 c_dA0 public default

   424   |

   425   o  0:ea207398892e ROOT public default

   426