Skip to content

Commit

Permalink
When duplicate tags exist, allow later taggings to override previous …
Browse files Browse the repository at this point in the history
…tags
  • Loading branch information
purcell committed Feb 3, 2011
1 parent 1c8cccb commit 2f11286
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions darcs-to-git
Expand Up @@ -65,8 +65,8 @@ in the source darcs repo into commits in that repository.
Thereafter, incremental patch conversion from the same source repo is
possible by repeating step 2.
NOTE: In case of multiple tags, only the first one will be applied.
If you really need to, you can manually identify the patch and use
NOTE: In case of duplicate tags, the latest will take precedence.
If you really need to, you can manually identify the patch and use
\"git tag -f <tagname> <sha1-of-commit-before-tagging>\".
OPTIONS
Expand Down Expand Up @@ -345,7 +345,7 @@ class DarcsPatch
ENV['GIT_AUTHOR_EMAIL'] = ENV['GIT_COMMITTER_EMAIL'] = git_author_email
ENV['GIT_AUTHOR_DATE'] = ENV['GIT_COMMITTER_DATE'] = date
if is_tag
run("git", "tag", "-a", "-m", git_commit_message, git_tag_name)
run("git", "tag", "-a", "-f", "-m", git_commit_message, git_tag_name)
else
if (new_files = git_new_files).any?
run(*(["git", "add", "-f"] + new_files))
Expand Down

0 comments on commit 2f11286

Please sign in to comment.