tests/test-topic-push.t
changeset 2988 62201935e1a7
parent 2985 f63c97c01f92
child 3000 bd7e8be29542
equal deleted inserted replaced
2987:d59d6413bb68 2988:62201935e1a7
   128   $ hg topic babar
   128   $ hg topic babar
   129   marked working directory as topic: babar
   129   marked working directory as topic: babar
   130   $ echo aaa > ddd
   130   $ echo aaa > ddd
   131   $ hg add ddd
   131   $ hg add ddd
   132   $ hg commit -m 'CD'
   132   $ hg commit -m 'CD'
       
   133   active topic 'babar' grew its first changeset
   133   $ hg log -G # keep track of phase because I saw some strange bug during developement
   134   $ hg log -G # keep track of phase because I saw some strange bug during developement
   134   @  4 default babar draft CD
   135   @  4 default babar draft CD
   135   |
   136   |
   136   | o  3 mountain  public CC
   137   | o  3 mountain  public CC
   137   |/
   138   |/
   240   $ hg topic celeste
   241   $ hg topic celeste
   241   marked working directory as topic: celeste
   242   marked working directory as topic: celeste
   242   $ echo aaa > eee
   243   $ echo aaa > eee
   243   $ hg add eee
   244   $ hg add eee
   244   $ hg commit -m 'CE'
   245   $ hg commit -m 'CE'
       
   246   active topic 'celeste' grew its first changeset
   245   $ hg log -G # keep track of phase because I saw some strange bug during developement
   247   $ hg log -G # keep track of phase because I saw some strange bug during developement
   246   @  5 default celeste draft CE
   248   @  5 default celeste draft CE
   247   |
   249   |
   248   | o  4 default babar draft CD
   250   | o  4 default babar draft CD
   249   |/
   251   |/
   433   $ echo aaa > aaa
   435   $ echo aaa > aaa
   434   $ hg add aaa
   436   $ hg add aaa
   435   $ hg topic topicA
   437   $ hg topic topicA
   436   marked working directory as topic: topicA
   438   marked working directory as topic: topicA
   437   $ hg commit -m 'CA'
   439   $ hg commit -m 'CA'
       
   440   active topic 'topicA' grew its first changeset
   438   $ hg up 'desc(CBASE)'
   441   $ hg up 'desc(CBASE)'
   439   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   442   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   440   $ echo aaa > bbb
   443   $ echo aaa > bbb
   441   $ hg add bbb
   444   $ hg add bbb
   442   $ hg topic topicB
   445   $ hg topic topicB
   443   marked working directory as topic: topicB
   446   marked working directory as topic: topicB
   444   $ hg commit -m 'CB'
   447   $ hg commit -m 'CB'
       
   448   active topic 'topicB' grew its first changeset
   445   $ cd ..
   449   $ cd ..
   446   $ hg push -R repoA repoB
   450   $ hg push -R repoA repoB
   447   pushing to repoB
   451   pushing to repoB
   448   searching for changes
   452   searching for changes
   449   adding changesets
   453   adding changesets