tests/test-push-warn.t
changeset 14526 4276e3202585
parent 14525 826a13720fbc
child 14624 f03c82d1f50a
equal deleted inserted replaced
14525:826a13720fbc 14526:4276e3202585
   122   searching for changes
   122   searching for changes
   123   abort: push creates new remote head a5dda829a167!
   123   abort: push creates new remote head a5dda829a167!
   124   (did you forget to merge? use push -f to force)
   124   (did you forget to merge? use push -f to force)
   125   [255]
   125   [255]
   126 
   126 
   127   $ hg push -r 3 -r 4 ../c
   127   $ hg push -v -r 3 -r 4 ../c
   128   pushing to ../c
   128   pushing to ../c
   129   searching for changes
   129   searching for changes
       
   130   all remote heads known locally
       
   131   new remote heads on branch 'default'
       
   132   new remote head a5dda829a167
       
   133   new remote head ee8fbc7a0295
   130   abort: push creates new remote head a5dda829a167!
   134   abort: push creates new remote head a5dda829a167!
   131   (did you forget to merge? use push -f to force)
   135   (did you forget to merge? use push -f to force)
   132   [255]
   136   [255]
   133 
   137 
   134   $ hg push -f -r 3 -r 4 ../c
   138   $ hg push -v -f -r 3 -r 4 ../c
   135   pushing to ../c
   139   pushing to ../c
   136   searching for changes
   140   searching for changes
       
   141   all remote heads known locally
       
   142   2 changesets found
   137   adding changesets
   143   adding changesets
   138   adding manifests
   144   adding manifests
   139   adding file changes
   145   adding file changes
   140   added 2 changesets with 2 changes to 1 files (+2 heads)
   146   added 2 changesets with 2 changes to 1 files (+2 heads)
   141 
   147