tests/test-topic-push.t
changeset 2120 e38156312410
parent 2045 db617700d318
child 2261 3e339f6717c7
child 2671 800463d6478c
equal deleted inserted replaced
2119:e1c26c632b6d 2120:e38156312410
    30   $ cd client
    30   $ cd client
    31   $ echo aaa > aaa
    31   $ echo aaa > aaa
    32   $ hg add aaa
    32   $ hg add aaa
    33   $ hg commit -m 'CA'
    33   $ hg commit -m 'CA'
    34   $ hg outgoing -G
    34   $ hg outgoing -G
    35   comparing with $TESTTMP/main
    35   comparing with $TESTTMP/main (glob)
    36   searching for changes
    36   searching for changes
    37   @  0 default  draft CA
    37   @  0 default  draft CA
    38   
    38   
    39   $ hg push
    39   $ hg push
    40   pushing to $TESTTMP/main
    40   pushing to $TESTTMP/main (glob)
    41   searching for changes
    41   searching for changes
    42   adding changesets
    42   adding changesets
    43   adding manifests
    43   adding manifests
    44   adding file changes
    44   adding file changes
    45   added 1 changesets with 1 changes to 1 files
    45   added 1 changesets with 1 changes to 1 files
    54   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    54   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    55   $ hg add ccc
    55   $ hg add ccc
    56   $ hg commit -m 'CC'
    56   $ hg commit -m 'CC'
    57   created new head
    57   created new head
    58   $ hg outgoing -G
    58   $ hg outgoing -G
    59   comparing with $TESTTMP/main
    59   comparing with $TESTTMP/main (glob)
    60   searching for changes
    60   searching for changes
    61   @  2 default  draft CC
    61   @  2 default  draft CC
    62   
    62   
    63   o  1 default  draft CB
    63   o  1 default  draft CB
    64   
    64   
    65   $ hg push
    65   $ hg push
    66   pushing to $TESTTMP/main
    66   pushing to $TESTTMP/main (glob)
    67   searching for changes
    67   searching for changes
    68   abort: push creates new remote head 9fe81b7f425d!
    68   abort: push creates new remote head 9fe81b7f425d!
    69   (merge or see 'hg help push' for details about pushing new heads)
    69   (merge or see 'hg help push' for details about pushing new heads)
    70   [255]
    70   [255]
    71   $ hg outgoing -r 'desc(CB)' -G
    71   $ hg outgoing -r 'desc(CB)' -G
    72   comparing with $TESTTMP/main
    72   comparing with $TESTTMP/main (glob)
    73   searching for changes
    73   searching for changes
    74   o  1 default  draft CB
    74   o  1 default  draft CB
    75   
    75   
    76   $ hg push -r 'desc(CB)'
    76   $ hg push -r 'desc(CB)'
    77   pushing to $TESTTMP/main
    77   pushing to $TESTTMP/main (glob)
    78   searching for changes
    78   searching for changes
    79   adding changesets
    79   adding changesets
    80   adding manifests
    80   adding manifests
    81   adding file changes
    81   adding file changes
    82   added 1 changesets with 1 changes to 1 files
    82   added 1 changesets with 1 changes to 1 files
    86   $ hg branch mountain
    86   $ hg branch mountain
    87   marked working directory as branch mountain
    87   marked working directory as branch mountain
    88   (branches are permanent and global, did you want a bookmark?)
    88   (branches are permanent and global, did you want a bookmark?)
    89   $ hg commit --amend
    89   $ hg commit --amend
    90   $ hg outgoing -G
    90   $ hg outgoing -G
    91   comparing with $TESTTMP/main
    91   comparing with $TESTTMP/main (glob)
    92   searching for changes
    92   searching for changes
    93   @  4 mountain  draft CC
    93   @  4 mountain  draft CC
    94   
    94   
    95   $ hg push 
    95   $ hg push 
    96   pushing to $TESTTMP/main
    96   pushing to $TESTTMP/main (glob)
    97   searching for changes
    97   searching for changes
    98   abort: push creates new remote branches: mountain!
    98   abort: push creates new remote branches: mountain!
    99   (use 'hg push --new-branch' to create new remote branches)
    99   (use 'hg push --new-branch' to create new remote branches)
   100   [255]
   100   [255]
   101   $ hg push --new-branch
   101   $ hg push --new-branch
   102   pushing to $TESTTMP/main
   102   pushing to $TESTTMP/main (glob)
   103   searching for changes
   103   searching for changes
   104   adding changesets
   104   adding changesets
   105   adding manifests
   105   adding manifests
   106   adding file changes
   106   adding file changes
   107   added 1 changesets with 1 changes to 1 files (+1 heads)
   107   added 1 changesets with 1 changes to 1 files (+1 heads)
   108   2 new obsolescence markers
   108   2 new obsolescence markers
   109 
   109 
   110 Including on non-publishing
   110 Including on non-publishing
   111 
   111 
   112   $ hg push --new-branch draft
   112   $ hg push --new-branch draft
   113   pushing to $TESTTMP/draft
   113   pushing to $TESTTMP/draft (glob)
   114   searching for changes
   114   searching for changes
   115   adding changesets
   115   adding changesets
   116   adding manifests
   116   adding manifests
   117   adding file changes
   117   adding file changes
   118   added 3 changesets with 3 changes to 3 files (+1 heads)
   118   added 3 changesets with 3 changes to 3 files (+1 heads)
   141   
   141   
   142 
   142 
   143 Pushing a new topic to a non publishing server should not be seen as a new head
   143 Pushing a new topic to a non publishing server should not be seen as a new head
   144 
   144 
   145   $ hg push draft
   145   $ hg push draft
   146   pushing to $TESTTMP/draft
   146   pushing to $TESTTMP/draft (glob)
   147   searching for changes
   147   searching for changes
   148   adding changesets
   148   adding changesets
   149   adding manifests
   149   adding manifests
   150   adding file changes
   150   adding file changes
   151   added 1 changesets with 1 changes to 1 files (+1 heads)
   151   added 1 changesets with 1 changes to 1 files (+1 heads)
   160   
   160   
   161 
   161 
   162 Pushing a new topic to a publishing server should be seen as a new head
   162 Pushing a new topic to a publishing server should be seen as a new head
   163 
   163 
   164   $ hg push
   164   $ hg push
   165   pushing to $TESTTMP/main
   165   pushing to $TESTTMP/main (glob)
   166   searching for changes
   166   searching for changes
   167   abort: push creates new remote head 67f579af159d!
   167   abort: push creates new remote head 67f579af159d!
   168   (merge or see 'hg help push' for details about pushing new heads)
   168   (merge or see 'hg help push' for details about pushing new heads)
   169   [255]
   169   [255]
   170   $ hg log -G
   170   $ hg log -G
   287   |/
   287   |/
   288   o  0 default  public CA
   288   o  0 default  public CA
   289   
   289   
   290 
   290 
   291   $ hg push draft
   291   $ hg push draft
   292   pushing to $TESTTMP/draft
   292   pushing to $TESTTMP/draft (glob)
   293   searching for changes
   293   searching for changes
   294   abort: push creates new remote head f0bc62a661be on branch 'default:babar'!
   294   abort: push creates new remote head f0bc62a661be on branch 'default:babar'!
   295   (merge or see 'hg help push' for details about pushing new heads)
   295   (merge or see 'hg help push' for details about pushing new heads)
   296   [255]
   296   [255]
   297 
   297 
   331   
   331   
   332 
   332 
   333 Reject when pushing to draft
   333 Reject when pushing to draft
   334 
   334 
   335   $ hg push draft -r .
   335   $ hg push draft -r .
   336   pushing to $TESTTMP/draft
   336   pushing to $TESTTMP/draft (glob)
   337   searching for changes
   337   searching for changes
   338   abort: push creates new remote head 4937c4cad39e!
   338   abort: push creates new remote head 4937c4cad39e!
   339   (merge or see 'hg help push' for details about pushing new heads)
   339   (merge or see 'hg help push' for details about pushing new heads)
   340   [255]
   340   [255]
   341 
   341 
   342 
   342 
   343 Reject when pushing to publishing
   343 Reject when pushing to publishing
   344 
   344 
   345   $ hg push -r .
   345   $ hg push -r .
   346   pushing to $TESTTMP/main
   346   pushing to $TESTTMP/main (glob)
   347   searching for changes
   347   searching for changes
   348   adding changesets
   348   adding changesets
   349   adding manifests
   349   adding manifests
   350   adding file changes
   350   adding file changes
   351   added 3 changesets with 2 changes to 2 files
   351   added 3 changesets with 2 changes to 2 files