##// END OF EJS Templates
fileset: add hint for list error to use or
fileset: add hint for list error to use or

File last commit:

r26420:2fc86d92 default
r27518:737ffdab default
Show More
test-issue612.t
34 lines | 624 B | text/troff | Tads3Lexer
Matt Mackall
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/612
Adrian Buehlmann
tests: unify test-issue*
r12195
$ hg init
$ mkdir src
$ echo a > src/a.c
$ hg ci -Ama
adding src/a.c
$ hg mv src source
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 moving src/a.c to source/a.c (glob)
Adrian Buehlmann
tests: unify test-issue*
r12195
$ 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
Matt Mackall
merge: don't use unknown()...
r16094 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann
tests: unify test-issue*
r12195 (branch merge, don't forget to commit)
$ hg status
M source/a.c
R src/a.c
Matt Mackall
merge: don't use unknown()...
r16094 ? src/a.o
Adrian Buehlmann
tests: unify test-issue*
r12195