Changeset 1603 in tailor

Timestamp:

06/02/08 16:45:59 (5 years ago)

Author:

lele@…

Hash name:

20080602144559-97f81-bbb277fd2961ff7984bb940a78475c8e76081df9

Message:

Document the 'overwrite-tags' for git
Also, emit a critical log indicating the possible source of the
problem, mentioning the option.

Files:

• README.rst (modified) (1 diff)
• vcpx/repository/git/target.py (modified) (2 diffs)

README.rst

@@ -964 +964 @@
   implementation misses many tags.
 
+overwrite-tags : bool
+  By default the backend does *not* overwrite previous tag with a
+  newer by the same name, and stops with an error. This flag allows
+  you to force git to override preceeding tag with the same name.
+
+  *False* by default.
+
 hg
 %%

vcpx/repository/git/target.py

@@ -172 +172 @@
         args = ["tag", "-a",]
         if self.repository.overwrite_tags:
-                args.append("-f")
+            args.append("-f")
 
         # Escape the tag name for git
@@ -197 +197 @@
 
         if c.exit_status:
+            if not self.repository.overwrite_tags:
+                self.log.critical("Couldn't set tag '%s': maybe it's a "
+                                  "conflict with a previous tag, and "
+                                  "overwrite-tags=True may help" %
+                                  tag_git)
             raise ChangesetApplicationFailure("%s returned status %d" %
                                               (str(c), c.exit_status))