tests/test-issue612.t
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 18 Sep 2012 15:29:43 +0200
branchstable
changeset 17594 536fee6a5486
parent 16094 0776a6cababe
child 26420 2fc86d92c4a9
permissions -rw-r--r--
largefiles: fix trailing spaces in test-largefiles.t With the default branch this will cause warnings from check-code.

http://mercurial.selenic.com/bts/issue612

  $ hg init
  $ mkdir src
  $ echo a > src/a.c
  $ hg ci -Ama
  adding src/a.c

  $ hg mv src source
  moving src/a.c to source/a.c (glob)

  $ hg ci -Ammove

  $ hg co -C 0
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo new > src/a.c
  $ echo compiled > src/a.o
  $ hg ci -mupdate
  created new head

  $ hg status
  ? src/a.o

  $ hg merge
  merging src/a.c and source/a.c to source/a.c
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

  $ hg status
  M source/a.c
  R src/a.c
  ? src/a.o