Mercurial > hg

view tests/test-pull-update.t @ 15040:a494b54b6ed3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
win32: msvcr71.dll should be used for python 2.4 and 2.5 Following is list of C-Runtime for versions of CPython on windows: - python 2.4.5 => MSVCR71.dll - python 2.5.4 => MSVCR71.dll - python 2.6.6 => MSVCR90.dll - python 2.7 => MSVCR90.dll - python 3.1.2 => MSVCR90.dll
author Shun-ichi GOTO <shunichi.goto@gmail.com>
date Mon, 08 Aug 2011 14:32:27 +0900
parents 610873cf064a
children f2719b387380
line wrap: on
line source

  $ hg init t
  $ cd t
  $ echo 1 > foo
  $ hg ci -Am m
  adding foo

  $ cd ..
  $ hg clone t tt
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd tt
  $ echo 1.1 > foo
  $ hg ci -Am m

  $ cd ../t
  $ echo 1.2 > foo
  $ hg ci -Am m

Should not update:

  $ hg pull -u ../tt
  pulling from ../tt
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files (+1 heads)
  not updating: crosses branches (merge branches or update --check to force update)

  $ cd ../tt

Should not update:

  $ hg pull -u ../t
  pulling from ../t
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files (+1 heads)
  not updating: crosses branches (merge branches or update --check to force update)

  $ HGMERGE=true hg merge
  merging foo
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ hg ci -mm

  $ cd ../t

Should work:

  $ hg pull -u ../tt
  pulling from ../tt
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files (-1 heads)
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved