comparison tests/test-fetch.t @ 15243:1e9451476bf8

tests: cleanup of echo statements left over from test conversion

15242:dac2edce4e4a

  $ hg -R nbase branch b
  marked working directory as branch b
  $ echo b > nbase/b
  $ hg -R nbase ci -Ad '3 0' -m b
  adding b
  $ echo
  

pull in change on foreign branch

  $ hg clone nbase n1
  updating to branch default

parent should be 2 (no automatic update)

  $ hg -R n2 parents --template '{rev}\n'
  2
  $ rm -fr n1 n2
  $ echo
  

pull in changes on both foreign and local branches

  $ hg clone nbase n1
  updating to branch default

parent should be 4 (fast forward)

  $ hg -R n2 parents --template '{rev}\n'
  4
  $ rm -fr n1 n2
  $ echo
  

pull changes on foreign (2 new heads) and local (1 new head) branches
with a local change

  $ hg clone nbase n1

  merging a
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  new changeset 3:* merges remote changes with local (glob)
  $ hg --cwd i1726r2 heads default --template '{rev}\n'
  3
  $ echo
  

test issue2047

  $ hg -q init i2047a
  $ cd i2047a

15243:1e9451476bf8

  $ hg -R nbase branch b
  marked working directory as branch b
  $ echo b > nbase/b
  $ hg -R nbase ci -Ad '3 0' -m b
  adding b

pull in change on foreign branch

  $ hg clone nbase n1
  updating to branch default

parent should be 2 (no automatic update)

  $ hg -R n2 parents --template '{rev}\n'
  2
  $ rm -fr n1 n2

pull in changes on both foreign and local branches

  $ hg clone nbase n1
  updating to branch default

parent should be 4 (fast forward)

  $ hg -R n2 parents --template '{rev}\n'
  4
  $ rm -fr n1 n2

pull changes on foreign (2 new heads) and local (1 new head) branches
with a local change

  $ hg clone nbase n1

  merging a
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  new changeset 3:* merges remote changes with local (glob)
  $ hg --cwd i1726r2 heads default --template '{rev}\n'
  3

test issue2047

  $ hg -q init i2047a
  $ cd i2047a