view tests/test-merge-revert.out @ 2347:5b178298b7f4

use a more reliable way to find what are the new changesets on pull/unbundle The number of csets and the hooks where wrong (negative number of csets) when we unbundled a bundle which contains csets we already had. Remove unused variables.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 24 May 2006 10:59:30 +0200
parents b2ae81a7df29
children
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