tests/test-merge8.t
author Adrian Buehlmann <adrian@cadifra.com>
Fri, 22 Jul 2011 09:53:15 +0200
changeset 14908 e2b5605501df
parent 11981 518b90d66fad
child 16913 f2719b387380
permissions -rw-r--r--
util: move "default" makedir to posix.py makedir is already defined in win32.py, which gets imported into util.py via windows.py if we are running on Windows

Test for changeset ba7c74081861
(update dirstate correctly for non-branchmerge updates)
  $ hg init a
  $ cd a
  $ echo a > a
  $ hg add a
  $ hg commit -m a
  $ cd ..
  $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd a
  $ hg mv a b
  $ hg commit -m move
  $ echo b >> b
  $ hg commit -m b
  $ cd ../b
  $ hg pull ../a
  pulling from ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  (run 'hg update' to get a working copy)
  $ hg update
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved