view tests/test-tag.out @ 10505:b3311e26f94f stable

merge: fix --preview to show all nodes that will be merged (issue2043).

Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge.  The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().

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

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

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
abort: tag names must be unique
failed
abort: the name 'tip' is reserved
failed
abort: tag 'bleah' already exists (use -f to force)
failed
abort: tag 'bleah' already exists (use -f to force)
failed
abort: tag 'blecch' does not exist
failed
abort: tag 'blecch' does not exist
failed
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0
868cc8fbb43b754ad09fa109885d243fc49adae7 gack
868cc8fbb43b754ad09fa109885d243fc49adae7 gawk
868cc8fbb43b754ad09fa109885d243fc49adae7 gorp
868cc8fbb43b754ad09fa109885d243fc49adae7 gack
3807bcf62c5614cb6c16436b514d7764ca5f1631 gack
3807bcf62c5614cb6c16436b514d7764ca5f1631 gack
0000000000000000000000000000000000000000 gack
868cc8fbb43b754ad09fa109885d243fc49adae7 gorp
0000000000000000000000000000000000000000 gorp
3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
abort: '\n' cannot be used in a tag name
abort: ':' cannot be used in a tag name
% cloning local tags
changeset:   0:0acdaf898367
tag:         foobar
tag:         bleah
tag:         bleah0
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     test

changeset:   1:3ecf002a1c57
tag:         bleah1
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added tag bleah for changeset 0acdaf898367

changeset:   2:868cc8fbb43b
tag:         gawk
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added tag bleah0 for changeset 0acdaf898367

changeset:   3:3807bcf62c56
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added tag gack, gawk, gorp for changeset 868cc8fbb43b

changeset:   4:140c6e8597b4
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added tag gack for changeset 3807bcf62c56

changeset:   5:470a65fa7cc9
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Removed tag gack, gorp

1[tip]   3ecf002a1c57   1970-01-12 13:46 +0000   test
  Added tag bleah for changeset 0acdaf898367

5[tip]   470a65fa7cc9   1970-01-12 13:46 +0000   test
  Removed tag gack, gorp

% issue 601
3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah13ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
f68b039e72eacbb2e68b0543e1f6e50990aa2bb5 localnewline
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
6ae703d793c8b1f097116869275ecd97b2977a2b newline