Mercurial > hg

annotate tests/test-586.out @ 6468:af2edc9c5bb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Fri, 04 Apr 2008 22:18:38 +0200
parents 8a5d8fb59ed2
children f1af59451c0c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4535
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 adding a
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 adding b
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 pulling from ../a
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 searching for changes
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 warning: repository is unrelated
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 adding changesets
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 adding manifests
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 adding file changes
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 added 1 changesets with 1 changes to 1 files (+1 heads)
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 (run 'hg heads' to see heads, 'hg merge' to merge)
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12 (branch merge, don't forget to commit)
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
13 C b