Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 2002:4aab906517c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Calling revlog.addgroup with an empty changegroup now raises RevlogError. The empty changegroup can be caused by remote servers dying soon after findincoming, and further code in pull assumes (correctly) that there are new changesets.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 24 Mar 2006 19:51:05 +0100
parents 91c56c427171
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed