Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert.out @ 2395:8ed45fb1053a
remove appendfile for the manifest when adding a changegroup
Since the changelog is using appendfile, the manifest entries cannot
be referenced, so we don't need to use append file for the manifest.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 04 Jun 2006 17:46:33 +0200 |
parents | b2ae81a7df29 |
children | 966632304dde |
line wrap: on
line source
1:016807e6fdaf 0:eb43f19ff115 016807e6fdaf tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved eb43f19ff115 eb43f19ff115+ reverting file1 ? file1.orig eb43f19ff115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file1 0 files updated, 1 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip