Mercurial > hg-stable
changeset 7017:8362086a1227
merge backout
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 10 Sep 2008 08:49:05 +0200 |
| parents | 6651de7176a0 (current diff) 58dcf10eea2b (diff) |
| children | 0b72836b0384 |
| files | tests/test-tag-issue916 tests/test-tag-issue916.out |
| diffstat | 3 files changed, 1 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Sep 09 21:32:39 2008 +0200 +++ b/mercurial/localrepo.py Wed Sep 10 08:49:05 2008 +0200 @@ -221,13 +221,7 @@ raise util.Abort(_('working copy of .hgtags is changed ' '(please commit .hgtags manually)')) - parents = self[None].parents() - parent = None - # use tip instead of the parent rev if there's no working copy - # (avoid creating a new head) - if len(parents) == 1 and parents[0].node() == nullid: - parent = self['tip'].node() - self._tag(names, node, message, local, user, date, parent=parent) + self._tag(names, node, message, local, user, date) def tags(self): '''return a mapping of tag to node'''
--- a/tests/test-tag-issue916 Tue Sep 09 21:32:39 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh - -hg init -echo a > a -hg commit -Am "test" -d "1000000 0" - -echo % issue 916 -hg up 000000 -hg parents -hg tag -r tip -d "1000000 0" "jglick" -echo % should it be removed ? -cat .hgtags -hg tip
--- a/tests/test-tag-issue916.out Tue Sep 09 21:32:39 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -adding a -% issue 916 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -% should it be removed ? -0acdaf8983679e0aac16e811534eb49d7ee1f2b4 jglick -changeset: 1:99b47705d075 -tag: tip -user: test -date: Mon Jan 12 13:46:40 1970 +0000 -summary: Added tag jglick for changeset 0acdaf898367 -