Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 3580:41989e55fa37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow update to switch to a different branch if the repo is clean
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 29 Oct 2006 13:08:10 +0100
parents d2b55e3c4e25
children fffc8a733bf9
comparison
equal deleted inserted replaced
3579:0ed2732aa393 3580:41989e55fa37
91 changeset: 1:802f095af299 91 changeset: 1:802f095af299
92 user: test 92 user: test
93 date: Mon Jan 12 13:46:40 1970 +0000 93 date: Mon Jan 12 13:46:40 1970 +0000
94 summary: 2 94 summary: 2
95 95
96 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes 96 abort: outstanding uncommited changes, use 'hg update -C' to lose changes
97 failed 97 failed
98 abort: outstanding uncommitted changes 98 abort: outstanding uncommitted changes
99 failed 99 failed
100 resolving manifests 100 resolving manifests
101 overwrite False partial False 101 overwrite False partial False