view tests/test-tag.out @ 2548:0229ff95faec

Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents c9226bcc288d
children 46182568b4ce
line wrap: on
line source

changeset:   0:0acdaf898367
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     test

changeset:   1:c5c60883086f
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added tag bleah for changeset 0acdaf8983679e0aac16e811534eb49d7ee1f2b4

changeset:   0:0acdaf898367
tag:         bleah
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     test

abort: working copy of .hgtags is changed (please commit .hgtags manually)
failed
use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
abort: use only one form to specify the revision
failed
use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0
c5c60883086f5526bd3e36814b94a73a4e75e172 bleah1
abort: '\n' cannot be used in a tag name
abort: ':' cannot be used in a tag name