$ echo "[extensions]" >> $HGRCPATH

  $ echo "graphlog=" >> $HGRCPATH

  $ hg init a

  $ cd a

  $ echo foo > t1

  $ hg add t1

  $ hg commit -m "1"

  $ cd ..

  $ hg clone a b

  updating to branch default

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd a

  $ echo foo > t2

  $ hg add t2

  $ hg commit -m "2"

  $ cd ../b

  $ echo foo > t3

  $ hg add t3

  $ hg commit -m "3"

  $ hg push ../a

  pushing to ../a

  searching for changes

  abort: push creates new remote head 1e108cc5548c!

  (you should pull and merge or use push -f to force)

  [255]

  $ hg push --debug ../a

  pushing to ../a

  query 1; heads

  searching for changes

  taking quick initial sample

  searching: 2 queries

  query 2; still undecided: 1, sample size is: 1

  2 total queries

  new remote heads on branch 'default'

  new remote head 1e108cc5548c

  abort: push creates new remote head 1e108cc5548c!

  (you should pull and merge or use push -f to force)

  [255]

  $ hg pull ../a

  pulling from ../a

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files (+1 heads)

  (run 'hg heads' to see heads, 'hg merge' to merge)

  $ hg push ../a

  pushing to ../a

  searching for changes

  abort: push creates new remote head 1e108cc5548c!

  (did you forget to merge? use push -f to force)

  [255]

  $ hg merge

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg commit -m "4"

  $ hg push ../a

  pushing to ../a

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 2 changesets with 1 changes to 1 files

  $ cd ..

  $ hg init c

  $ cd c

  $ for i in 0 1 2; do

  >     echo $i >> foo

  >     hg ci -Am $i

  > done

  adding foo

  $ cd ..

  $ hg clone c d

  updating to branch default

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd d

  $ for i in 0 1; do

  >    hg co -C $i

  >    echo d-$i >> foo

  >    hg ci -m d-$i

  > done

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  created new head

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  created new head

  $ HGMERGE=true hg merge 3

  merging foo

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m c-d

  $ hg push ../c

  pushing to ../c

  searching for changes

  abort: push creates new remote head 6346d66eb9f5!

  (did you forget to merge? use push -f to force)

  [255]

  $ hg push -r 2 ../c

  pushing to ../c

  searching for changes

  no changes found

  [1]

  $ hg push -r 3 ../c

  pushing to ../c

  searching for changes

  abort: push creates new remote head a5dda829a167!

  (did you forget to merge? use push -f to force)

  [255]

  $ hg push -v -r 3 -r 4 ../c

  pushing to ../c

  searching for changes

  new remote heads on branch 'default'

  new remote head a5dda829a167

  new remote head ee8fbc7a0295

  abort: push creates new remote head a5dda829a167!

  (did you forget to merge? use push -f to force)

  [255]

  $ hg push -v -f -r 3 -r 4 ../c

  pushing to ../c

  searching for changes

  2 changesets found

  adding changesets

  adding manifests

  adding file changes

  added 2 changesets with 2 changes to 1 files (+2 heads)

  $ hg push -r 5 ../c

  pushing to ../c

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files (-1 heads)

  $ hg in ../c

  comparing with ../c

  searching for changes

  no changes found

  [1]

Issue450: push -r warns about remote head creation even if no heads

will be created

  $ hg init ../e

  $ hg push -r 0 ../e

  pushing to ../e

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

  $ hg push -r 1 ../e

  pushing to ../e

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

  $ cd ..

Issue736: named branches are not considered for detection of

unmerged heads in "hg push"

  $ hg init f

  $ cd f

  $ hg -q branch a

  $ echo 0 > foo

  $ hg -q ci -Am 0

  $ echo 1 > foo

  $ hg -q ci -m 1

  $ hg -q up 0

  $ echo 2 > foo

  $ hg -q ci -m 2

  $ hg -q up 0

  $ hg -q branch b

  $ echo 3 > foo

  $ hg -q ci -m 3

  $ cd ..

  $ hg -q clone f g

  $ cd g

Push on existing branch and new branch:

  $ hg -q up 1

  $ echo 4 > foo

  $ hg -q ci -m 4

  $ hg -q up 0

  $ echo 5 > foo

  $ hg -q branch c

  $ hg -q ci -m 5

  $ hg push ../f

  pushing to ../f

  searching for changes

  abort: push creates new remote branches: c!

  (use 'hg push --new-branch' to create new remote branches)

  [255]

  $ hg push -r 4 -r 5 ../f

  pushing to ../f

  searching for changes

  abort: push creates new remote branches: c!

  (use 'hg push --new-branch' to create new remote branches)

  [255]

Multiple new branches:

  $ hg -q branch d

  $ echo 6 > foo

  $ hg -q ci -m 6

  $ hg push ../f

  pushing to ../f

  searching for changes

  abort: push creates new remote branches: c, d!

  (use 'hg push --new-branch' to create new remote branches)

  [255]

  $ hg push -r 4 -r 6 ../f

  pushing to ../f

  searching for changes

  abort: push creates new remote branches: c, d!

  (use 'hg push --new-branch' to create new remote branches)

  [255]

  $ cd ../g

Fail on multiple head push:

  $ hg -q up 1

  $ echo 7 > foo

  $ hg -q ci -m 7

  $ hg push -r 4 -r 7 ../f

  pushing to ../f

  searching for changes

  abort: push creates new remote head 0b715ef6ff8f on branch 'a'!

  (did you forget to merge? use push -f to force)

  [255]

Push replacement head on existing branches:

  $ hg -q up 3

  $ echo 8 > foo

  $ hg -q ci -m 8

  $ hg push -r 7 -r 8 ../f

  pushing to ../f

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 2 changesets with 2 changes to 1 files

Merge of branch a to other branch b followed by unrelated push

on branch a:

  $ hg -q up 7

  $ HGMERGE=true hg -q merge 8

  $ hg -q ci -m 9

  $ hg -q up 8

  $ echo 10 > foo

  $ hg -q ci -m 10

  $ hg push -r 9 ../f

  pushing to ../f

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files (-1 heads)

  $ hg push -r 10 ../f

  pushing to ../f

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files (+1 heads)

Cheating the counting algorithm:

  $ hg -q up 9

  $ HGMERGE=true hg -q merge 2

  $ hg -q ci -m 11

  $ hg -q up 1

  $ echo 12 > foo

  $ hg -q ci -m 12

  $ hg push -r 11 -r 12 ../f

  pushing to ../f

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 2 changesets with 2 changes to 1 files

Failed push of new named branch:

  $ echo 12 > foo

  $ hg -q ci -m 12a

  [1]

  $ hg -q up 11

  $ echo 13 > foo

  $ hg -q branch e

  $ hg -q ci -m 13d

  $ hg push -r 12 -r 13 ../f

  pushing to ../f

  searching for changes

  abort: push creates new remote branches: e!

  (use 'hg push --new-branch' to create new remote branches)

  [255]

Using --new-branch to push new named branch:

  $ hg push --new-branch -r 12 -r 13 ../f

  pushing to ../f

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

Checking prepush logic does not allow silently pushing

multiple new heads:

  $ cd ..

  $ hg init h

  $ echo init > h/init

  $ hg -R h ci -Am init

  adding init

  $ echo a > h/a

  $ hg -R h ci -Am a

  adding a

  $ hg clone h i

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg -R h up 0

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo b > h/b

  $ hg -R h ci -Am b

  adding b

  created new head

  $ hg -R i up 0

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo c > i/c

  $ hg -R i ci -Am c