| author | Patrick Mezard <pmezard@gmail.com> |
| Tue, 12 Jan 2010 22:20:21 +0100 | |
| changeset 10241 | 4b2a086bee31 |
| parent 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 |
|
9717
68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Stuart W Marks <smarks@smarks.org>
parents:
6381
diff
changeset
|
5 |
abort: crosses branches (use 'hg merge' to merge or use '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 |
|
9717
68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Stuart W Marks <smarks@smarks.org>
parents:
6381
diff
changeset
|
7 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |