comparison tests/test-push-warn.out @ 2019:ced2d3620f95

add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents 9344f5dd4488
children fc22ed56afe3
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
6 searching for changes 6 searching for changes
7 adding changesets 7 adding changesets
8 adding manifests 8 adding manifests
9 adding file changes 9 adding file changes
10 added 1 changesets with 1 changes to 1 files (+1 heads) 10 added 1 changesets with 1 changes to 1 files (+1 heads)
11 (run 'hg update' to get a working copy) 11 (run 'hg heads' to see heads, 'hg merge' to merge)
12 pushing to ../a 12 pushing to ../a
13 searching for changes 13 searching for changes
14 abort: push creates new remote branches! 14 abort: push creates new remote branches!
15 (did you forget to merge? use push -f to force) 15 (did you forget to merge? use push -f to force)
16 pushing to ../a 16 pushing to ../a