tests/test-graft.t
changeset 15918 4f9853e7f690
parent 15907 51fc43253a52
child 16094 0776a6cababe
equal deleted inserted replaced
15917:e66084ef8449 15918:4f9853e7f690
    20   $ hg branch -q stable
    20   $ hg branch -q stable
    21   $ hg ci -m5
    21   $ hg ci -m5
    22   $ hg merge -q default --tool internal:local
    22   $ hg merge -q default --tool internal:local
    23   $ hg branch -q default
    23   $ hg branch -q default
    24   $ hg ci -m6
    24   $ hg ci -m6
       
    25   $ hg phase --public 3
       
    26   $ hg phase --force --secret 6
       
    27 
       
    28   $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
       
    29   @    test@6.secret: 6
       
    30   |\
       
    31   | o  test@5.draft: 5
       
    32   | |
       
    33   o |  test@4.draft: 4
       
    34   |/
       
    35   o  baz@3.public: 3
       
    36   |
       
    37   o  test@2.public: 2
       
    38   |
       
    39   o  bar@1.public: 1
       
    40   |
       
    41   o  test@0.public: 0
       
    42   
    25 
    43 
    26 Need to specify a rev:
    44 Need to specify a rev:
    27 
    45 
    28   $ hg graft
    46   $ hg graft
    29   abort: no revisions specified
    47   abort: no revisions specified
   179     a
   197     a
   180   R a
   198   R a
   181 
   199 
   182 View graph:
   200 View graph:
   183 
   201 
   184   $ hg --config extensions.graphlog= log -G --template '{author}@{rev}: {desc}\n'
   202   $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
   185   @  test@11: 3
   203   @  test@11.draft: 3
   186   |
   204   |
   187   o  test@10: 4
   205   o  test@10.draft: 4
   188   |
   206   |
   189   o  test@9: 5
   207   o  test@9.draft: 5
   190   |
   208   |
   191   o  bar@8: 1
   209   o  bar@8.draft: 1
   192   |
   210   |
   193   o  foo@7: 2
   211   o  foo@7.draft: 2
   194   |
   212   |
   195   | o    test@6: 6
   213   | o    test@6.secret: 6
   196   | |\
   214   | |\
   197   | | o  test@5: 5
   215   | | o  test@5.draft: 5
   198   | | |
   216   | | |
   199   | o |  test@4: 4
   217   | o |  test@4.draft: 4
   200   | |/
   218   | |/
   201   | o  baz@3: 3
   219   | o  baz@3.public: 3
   202   | |
   220   | |
   203   | o  test@2: 2
   221   | o  test@2.public: 2
   204   | |
   222   | |
   205   | o  bar@1: 1
   223   | o  bar@1.public: 1
   206   |/
   224   |/
   207   o  test@0: 0
   225   o  test@0.public: 0
   208   
   226   
   209 Graft again onto another branch should preserve the original source
   227 Graft again onto another branch should preserve the original source
   210   $ hg up -q 0
   228   $ hg up -q 0
   211   $ echo 'g'>g
   229   $ echo 'g'>g
   212   $ hg add g
   230   $ hg add g