tests/test-merge8.t
author Mads Kiilerich <mads@kiilerich.com>
Fri, 29 Jun 2012 01:51:48 +0200
changeset 17053 0e4171fdb9d4
parent 16913 f2719b387380
child 34661 eb586ed5d8ce
permissions -rw-r--r--
convert: check for failed svn import in debugsvnlog and abort cleanly 'hg debugsvnlog' failed with a crash when using the uninitialized transport in get_log_child if the import of the svn libraries had failed. 'convert' should never get as far as launching 'hg debugsvnlog' if the svn libraries are missing, but by launching a subprocess there is risk that the environment is mangled so the second import fails. It is in principle also possible to launch the command manually.

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

  $ cd ..