Mercurial > hg
view tests/test-issue612.t @ 30025:4d9999e43ff7
histedit: avoid converting nodeid to context and back again
It looks like this became unnecessary in e767f5aba810 (histedit: fix
preventing strips during histedit, 2015-04-04).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 27 Sep 2016 22:09:28 -0700 |
parents | 2fc86d92c4a9 |
children | 4441705b7111 |
line wrap: on
line source
https://bz.mercurial-scm.org/612 $ 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