Show More
@@ -7077,7 +7077,8 def tag(ui, repo, name1, *names, **opts) | |||||
7077 | raise error.Abort(_('uncommitted merge')) |
|
7077 | raise error.Abort(_('uncommitted merge')) | |
7078 | bheads = repo.branchheads() |
|
7078 | bheads = repo.branchheads() | |
7079 | if not opts.get('force') and bheads and p1 not in bheads: |
|
7079 | if not opts.get('force') and bheads and p1 not in bheads: | |
7080 |
raise error.Abort(_('not at a branch head |
|
7080 | raise error.Abort(_('working directory is not at a branch head ' | |
|
7081 | '(use -f to force)')) | |||
7081 | r = scmutil.revsingle(repo, rev_).node() |
|
7082 | r = scmutil.revsingle(repo, rev_).node() | |
7082 |
|
7083 | |||
7083 | if not message: |
|
7084 | if not message: |
@@ -109,7 +109,7 tagging on a non-head revision | |||||
109 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
109 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
110 | $ hg tag -l localblah |
|
110 | $ hg tag -l localblah | |
111 | $ hg tag "foobar" |
|
111 | $ hg tag "foobar" | |
112 | abort: not at a branch head (use -f to force) |
|
112 | abort: working directory is not at a branch head (use -f to force) | |
113 | [255] |
|
113 | [255] | |
114 | $ hg tag -f "foobar" |
|
114 | $ hg tag -f "foobar" | |
115 | $ cat .hgtags |
|
115 | $ cat .hgtags | |
@@ -339,7 +339,7 tagging on null rev | |||||
339 | $ hg up null |
|
339 | $ hg up null | |
340 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
340 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
341 | $ hg tag nullrev |
|
341 | $ hg tag nullrev | |
342 | abort: not at a branch head (use -f to force) |
|
342 | abort: working directory is not at a branch head (use -f to force) | |
343 | [255] |
|
343 | [255] | |
344 |
|
344 | |||
345 | $ hg init empty |
|
345 | $ hg init empty |
General Comments 0
You need to be logged in to leave comments.
Login now