mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
7fa918cefd
Summary: Also change the internal API so it no longer accepts the "heads" argument. Reviewed By: ryanmce Differential Revision: D6745865 fbshipit-source-id: 368742be49b192f7630421003552d0a10eb0b76d
34 lines
598 B
Perl
34 lines
598 B
Perl
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
|
|
|
|
$ 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
|
|
|
|
$ 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
|
|
|