| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Mon, 27 Oct 2008 21:50:16 +0100 | |
| changeset 7271 | 8046f0a070a6 |
| parent 6381 | 0b89315d5de2 |
| child 9717 | 68a1b9d0663e |
| permissions | -rw-r--r-- |
|
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 |
|
6375
cdc458b12f0f
update: better logic and messages for updates
Matt Mackall <mpm@selenic.com>
parents:
6350
diff
changeset
|
5 |
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard 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 |
|
6381
0b89315d5de2
Fix missing space in one of the new update messages.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6375
diff
changeset
|
7 |
abort: crosses branches (use 'hg merge' or 'hg update -C') |