Mercurial > hg
annotate tests/test-issue612.out @ 9400:a6747ba27d22
doc/Makefile: detect rst2man errors
Make couldn't detect rst2man errors when it wasn't the last command, so empty
man page files would be installed.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 20 Aug 2009 23:35:37 +0200 |
parents | 368a4ec603cc |
children |
rev | line source |
---|---|
4819
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 adding src/a.c |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
4819
diff
changeset
|
2 moving src/a.c to source/a.c |
4819
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5610
diff
changeset
|
4 created new head |
4819
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 ? src/a.o |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
6 merging src/a.c and source/a.c to source/a.c |
4819
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 (branch merge, don't forget to commit) |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 M source/a.c |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 R src/a.c |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 ? source/a.o |