Mercurial > hg
view tests/test-issue612.t @ 12260:0a63e91c519d
tests: unify test-merge-remove
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Sun, 12 Sep 2010 12:11:39 +0200 |
parents | ee41be2bbf5a |
children | b63f6422d2a7 |
line wrap: on
line source
# 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 $ 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 1 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 ? source/a.o