Mercurial > hg

annotate tests/test-merge5.out @ 6374:31a01e3d99cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 24 Mar 2008 16:20:15 +0100
parents 6aa4a3fa4e60
children cdc458b12f0f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2038
diff changeset
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 removing b
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 3592
diff changeset
3 created new head
6350
6aa4a3fa4e60 update: no -C needed to switch branches without outstanding changes
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
4 % should abort
3592
fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3580
diff changeset
5 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
6350
6aa4a3fa4e60 update: no -C needed to switch branches without outstanding changes
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
6 % should succeed
6aa4a3fa4e60 update: no -C needed to switch branches without outstanding changes
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved