Show More
@@ -541,7 +541,7 b' def tag(repo, names, node, message, loca' | |||||
541 |
|
541 | |||
542 | with repo.wlock(): |
|
542 | with repo.wlock(): | |
543 | repo.tags() # instantiate the cache |
|
543 | repo.tags() # instantiate the cache | |
544 |
_tag(repo |
|
544 | _tag(repo, names, node, message, local, user, date, | |
545 | editor=editor) |
|
545 | editor=editor) | |
546 |
|
546 | |||
547 | def _tag(repo, names, node, message, local, user, date, extra=None, |
|
547 | def _tag(repo, names, node, message, local, user, date, extra=None, |
@@ -411,6 +411,59 b' tagging on null rev' | |||||
411 | abort: cannot tag null revision |
|
411 | abort: cannot tag null revision | |
412 | [255] |
|
412 | [255] | |
413 |
|
413 | |||
|
414 | issue5539: pruned tags do not appear in .hgtags | |||
|
415 | ||||
|
416 | $ cat >> $HGRCPATH << EOF | |||
|
417 | > [experimental] | |||
|
418 | > stabilization=createmarkers,exchange | |||
|
419 | > EOF | |||
|
420 | $ hg up e4d483960b9b --quiet | |||
|
421 | $ echo aaa >>a | |||
|
422 | $ hg ci -maaa | |||
|
423 | $ hg log -r . -T "{node}\n" | |||
|
424 | 743b3afd5aa69f130c246806e48ad2e699f490d2 | |||
|
425 | $ hg tag issue5539 | |||
|
426 | hook: tag changes detected | |||
|
427 | hook: +A 743b3afd5aa69f130c246806e48ad2e699f490d2 issue5539 | |||
|
428 | $ cat .hgtags | |||
|
429 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar | |||
|
430 | a0eea09de1eeec777b46f2085260a373b2fbc293 newline | |||
|
431 | 743b3afd5aa69f130c246806e48ad2e699f490d2 issue5539 | |||
|
432 | $ hg log -r . -T "{node}\n" | |||
|
433 | abeb261f0508ecebcd345ce21e7a25112df417aa | |||
|
434 | (mimic 'hg prune' command by obsoleting current changeset and then moving to its parent) | |||
|
435 | $ hg debugobsolete abeb261f0508ecebcd345ce21e7a25112df417aa --record-parents | |||
|
436 | obsoleted 1 changesets | |||
|
437 | $ hg up ".^" --quiet | |||
|
438 | $ cat .hgtags | |||
|
439 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar | |||
|
440 | a0eea09de1eeec777b46f2085260a373b2fbc293 newline | |||
|
441 | $ echo bbb >>a | |||
|
442 | $ hg ci -mbbb | |||
|
443 | $ hg log -r . -T "{node}\n" | |||
|
444 | 089dd20da58cae34165c37b064539c6ac0c6a0dd | |||
|
445 | $ hg tag issue5539 | |||
|
446 | hook: tag changes detected | |||
|
447 | hook: -M 743b3afd5aa69f130c246806e48ad2e699f490d2 issue5539 | |||
|
448 | hook: +M 089dd20da58cae34165c37b064539c6ac0c6a0dd issue5539 | |||
|
449 | $ hg id | |||
|
450 | 0accf560a709 tip | |||
|
451 | $ cat .hgtags | |||
|
452 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar | |||
|
453 | a0eea09de1eeec777b46f2085260a373b2fbc293 newline | |||
|
454 | 089dd20da58cae34165c37b064539c6ac0c6a0dd issue5539 | |||
|
455 | $ hg tags | |||
|
456 | tip 19:0accf560a709 | |||
|
457 | issue5539 18:089dd20da58c | |||
|
458 | new-topo-head 13:0f26aaea6f74 | |||
|
459 | baz 13:0f26aaea6f74 | |||
|
460 | custom-tag 12:75a534207be6 | |||
|
461 | tag-and-branch-same-name 11:fc93d2ea1cd7 | |||
|
462 | newline 9:a0eea09de1ee | |||
|
463 | localnewline 8:c2899151f4e7 | |||
|
464 | localblah 0:acb14030fe0a | |||
|
465 | foobar 0:acb14030fe0a | |||
|
466 | ||||
414 | $ cd .. |
|
467 | $ cd .. | |
415 |
|
468 | |||
416 | tagging on an uncommitted merge (issue2542) |
|
469 | tagging on an uncommitted merge (issue2542) |
General Comments 0
You need to be logged in to leave comments.
Login now