comparison tests/test-586.out @ 4536:720ae5085ee3

commit: fix bug where dirstate for removed file is confused This fixes issue586
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jun 2007 21:16:58 -0500
parents
children
comparison
equal deleted inserted replaced
4535:121999244123 4536:720ae5085ee3
1 adding a
2 adding b
3 pulling from ../a
4 searching for changes
5 warning: repository is unrelated
6 adding changesets
7 adding manifests
8 adding file changes
9 added 1 changesets with 1 changes to 1 files (+1 heads)
10 (run 'hg heads' to see heads, 'hg merge' to merge)
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12 (branch merge, don't forget to commit)
13 C b