tests/test-merge8.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 05 Aug 2007 23:04:56 -0300
changeset 5080 b304c2496f52
parent 4416 bb1800a7d7e1
permissions -rw-r--r--
dirstate: fix rebuild; add a test If rebuild calls invalidate, it will just queue a (re)read of the dirstate file, while what we really want is to empty the current state.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved