tests/test-topic-push-concurrent-on.t
changeset 2988 62201935e1a7
parent 2985 f63c97c01f92
child 3000 bd7e8be29542
equal deleted inserted replaced
2987:d59d6413bb68 2988:62201935e1a7
   132   $ hg topic babar
   132   $ hg topic babar
   133   marked working directory as topic: babar
   133   marked working directory as topic: babar
   134   $ echo aaa > ddd
   134   $ echo aaa > ddd
   135   $ hg add ddd
   135   $ hg add ddd
   136   $ hg commit -m 'CD'
   136   $ hg commit -m 'CD'
       
   137   active topic 'babar' grew its first changeset
   137   $ hg log -G # keep track of phase because I saw some strange bug during developement
   138   $ hg log -G # keep track of phase because I saw some strange bug during developement
   138   @  4 default babar draft CD
   139   @  4 default babar draft CD
   139   |
   140   |
   140   | o  3 mountain  public CC
   141   | o  3 mountain  public CC
   141   |/
   142   |/
   189   $ hg topic celeste
   190   $ hg topic celeste
   190   marked working directory as topic: celeste
   191   marked working directory as topic: celeste
   191   $ echo aaa > eee
   192   $ echo aaa > eee
   192   $ hg add eee
   193   $ hg add eee
   193   $ hg commit -m 'CE'
   194   $ hg commit -m 'CE'
       
   195   active topic 'celeste' grew its first changeset
   194   $ hg log -G # keep track of phase because I saw some strange bug during developement
   196   $ hg log -G # keep track of phase because I saw some strange bug during developement
   195   @  5 default celeste draft CE
   197   @  5 default celeste draft CE
   196   |
   198   |
   197   | o  4 default babar draft CD
   199   | o  4 default babar draft CD
   198   |/
   200   |/
   382   $ echo aaa > aaa
   384   $ echo aaa > aaa
   383   $ hg add aaa
   385   $ hg add aaa
   384   $ hg topic topicA
   386   $ hg topic topicA
   385   marked working directory as topic: topicA
   387   marked working directory as topic: topicA
   386   $ hg commit -m 'CA'
   388   $ hg commit -m 'CA'
       
   389   active topic 'topicA' grew its first changeset
   387   $ hg up 'desc(CBASE)'
   390   $ hg up 'desc(CBASE)'
   388   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   391   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   389   $ echo aaa > bbb
   392   $ echo aaa > bbb
   390   $ hg add bbb
   393   $ hg add bbb
   391   $ hg topic topicB
   394   $ hg topic topicB
   392   marked working directory as topic: topicB
   395   marked working directory as topic: topicB
   393   $ hg commit -m 'CB'
   396   $ hg commit -m 'CB'
       
   397   active topic 'topicB' grew its first changeset
   394   $ cd ..
   398   $ cd ..
   395   $ hg push -R repoA repoB
   399   $ hg push -R repoA repoB
   396   pushing to repoB
   400   pushing to repoB
   397   searching for changes
   401   searching for changes
   398   adding changesets
   402   adding changesets