tests/test-topic-dest.t
changeset 1871 58ef5699fb35
parent 1870 8dd5200b4086
child 1875 9eba8561870b
equal deleted inserted replaced
1870:8dd5200b4086 1871:58ef5699fb35
    89   o  0 () c_alpha
    89   o  0 () c_alpha
    90   
    90   
    91   $ hg log -r 'ngtip(.)'
    91   $ hg log -r 'ngtip(.)'
    92   6 () c_epsilon
    92   6 () c_epsilon
    93 
    93 
       
    94 merge destination
       
    95 =================
       
    96 
       
    97   $ hg up 'ngtip(default)'
       
    98   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
    99   $ echo zeta >> zeta
       
   100   $ hg add zeta
       
   101   $ hg ci -m "c_zeta"
       
   102   created new head
       
   103   $ hg log -G
       
   104   @  9 () c_zeta
       
   105   |
       
   106   | o  8 (monkey) zephir
       
   107   |/
       
   108   | o  7 (elephant) babar
       
   109   |/
       
   110   o  6 () c_epsilon
       
   111   |
       
   112   o  3 () c_delta
       
   113   |
       
   114   o  2 () c_gamma
       
   115   |
       
   116   o  1 () c_beta
       
   117   |
       
   118   o  0 () c_alpha
       
   119   
       
   120   $ hg up elephant
       
   121   switching to topic elephant
       
   122   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   123   $ hg rebase # make sure tip is elsewhere
       
   124   rebasing 7:8d0b77140b05 "babar"
       
   125   $ hg up monkey
       
   126   switching to topic monkey
       
   127   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   128   $ hg merge
       
   129   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   130   (branch merge, don't forget to commit)
       
   131   $ hg topic
       
   132      elephant
       
   133    * monkey
       
   134   $ hg ci -m 'merge with default'
       
   135   $ hg topic
       
   136      elephant
       
   137    * monkey
       
   138   $ hg log -G
       
   139   @    11 (monkey) merge with default
       
   140   |\
       
   141   | | o  10 (elephant) babar
       
   142   | |/
       
   143   | o  9 () c_zeta
       
   144   | |
       
   145   o |  8 (monkey) zephir
       
   146   |/
       
   147   o  6 () c_epsilon
       
   148   |
       
   149   o  3 () c_delta
       
   150   |
       
   151   o  2 () c_gamma
       
   152   |
       
   153   o  1 () c_beta
       
   154   |
       
   155   o  0 () c_alpha
       
   156