Mercurial > hg
comparison tests/test-convert-svn-sink.out @ 12314:f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
| author | Brodie Rao <brodie@bitheap.org> |
|---|---|
| date | Sun, 12 Sep 2010 18:05:53 -0500 |
| parents | 14db59e3b248 |
| children | e0ee3e822a9a |
comparison
equal
deleted
inserted
replaced
| 12313:2912881c2a98 | 12314:f2daa6ab514a |
|---|---|
| 263 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | 263 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 264 merging b | 264 merging b |
| 265 warning: conflicts during merge. | 265 warning: conflicts during merge. |
| 266 merging b failed! | 266 merging b failed! |
| 267 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | 267 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 268 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | 268 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 269 assuming destination b-hg | 269 assuming destination b-hg |
| 270 initializing svn repository 'b-hg' | 270 initializing svn repository 'b-hg' |
| 271 initializing svn working copy 'b-hg-wc' | 271 initializing svn working copy 'b-hg-wc' |
| 272 scanning source... | 272 scanning source... |
| 273 sorting... | 273 sorting... |