tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 24 May 2006 10:59:30 +0200
changeset 2347 5b178298b7f4
parent 2175 b2ae81a7df29
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
     1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
     2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
     3
(branch merge, don't forget to commit)