tests/test-merge-force.t
author Idan Kamara <idankk86@gmail.com>
Thu, 14 Jul 2011 11:46:15 +0300
branchstable
changeset 14882 bb2cffe81a94
parent 12316 4134686b83e1
child 15619 6c8573dd1b6b
permissions -rw-r--r--
cmdserver: take repo.baseui as our ui The ui passed to server() is really repo.ui, that is it contains its local configuration as well. When running commands that use a different repo than the servers cached repo, we don't want to use that ui as the baseui for the new repo.

  $ hg init

  $ echo a > a
  $ hg ci -qAm 'add a'

  $ echo b > b
  $ hg ci -qAm 'add b'

  $ hg up -qC 0
  $ hg rm a
  $ hg ci -m 'rm a'
  created new head

  $ hg up -qC 1
  $ rm a

Local deleted a file, remote removed

Should fail, since there are deleted files:

  $ hg merge
  abort: outstanding uncommitted changes (use 'hg status' to list changes)
  [255]

Should succeed with --force:

  $ hg -v merge --force
  resolving manifests
  removing a
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

Should show 'a' as removed:

  $ hg status
  R a

  $ hg ci -m merge

Should not show 'a':

  $ hg manifest
  b