tests/test-push-warn.t
branchstable
changeset 14833 308e1b5acc87
parent 14624 f03c82d1f50a
child 15615 41885892796e
equal deleted inserted replaced
14832:d60e4f227d75 14833:308e1b5acc87
   125   [255]
   125   [255]
   126 
   126 
   127   $ hg push -v -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'
   130   new remote heads on branch 'default'
   132   new remote head a5dda829a167
   131   new remote head a5dda829a167
   133   new remote head ee8fbc7a0295
   132   new remote head ee8fbc7a0295
   134   abort: push creates new remote head a5dda829a167!
   133   abort: push creates new remote head a5dda829a167!
   135   (did you forget to merge? use push -f to force)
   134   (did you forget to merge? use push -f to force)
   136   [255]
   135   [255]
   137 
   136 
   138   $ hg push -v -f -r 3 -r 4 ../c
   137   $ hg push -v -f -r 3 -r 4 ../c
   139   pushing to ../c
   138   pushing to ../c
   140   searching for changes
   139   searching for changes
   141   all remote heads known locally
       
   142   2 changesets found
   140   2 changesets found
   143   adding changesets
   141   adding changesets
   144   adding manifests
   142   adding manifests
   145   adding file changes
   143   adding file changes
   146   added 2 changesets with 2 changes to 1 files (+2 heads)
   144   added 2 changesets with 2 changes to 1 files (+2 heads)