[prev in list] [next in list] [prev in thread] [next in thread] 

List:       svnmerge
Subject:    [Svnmerge] [PATCH] Add --force option
From:       rasky () develer ! com (Giovanni Bajo)
Date:       2005-10-20 4:54:37
Message-ID: 00df01c5d56d$08bb6ea0$bf03030a () trilan
[Download RAW message or body]

Hello,

I added a new -F/--force option, available for all sub-commands, which
forces svnmerge to act even if the working copy is not clean or there are
pending updates.

Committed as r175.
-- 
Giovanni Bajo
-------------- next part --------------
Index: svnmerge.py
===================================================================
--- svnmerge.py	(revision 174)
+++ svnmerge.py	(working copy)
@@ -43,6 +43,9 @@
 # - "svnmerge avail" has grown two new options:
 #   -B to display a list of the blocked revisions
 #   -A to display both the the blocked and the available revisions.
+# - Improved generated commit message to make it machine parsable even when
+#   merging commits which are themselves merges.
+# - Add --force option to skip working copy check
 #
 # TODO:
 #  - Add "svnmerge avail -R": show logs in reverse order
@@ -218,6 +221,9 @@
 
 def check_dir_clean(dir):
     """Check the current status of dir for up-to-dateness and local mods."""
+    if opts["force"]:
+        report('skipping status check because of --force')
+        return
     report('checking status of "%s"' % dir)
     for L in launchsvn("status -q %s" % dir):
         if L:
@@ -1035,6 +1041,8 @@
            help="show subversion commands that make changes"),
     Option("-n", "--dry-run",
            help="don't actually change anything, just pretend; implies --show-changes"),
+    Option("-F", "--force",
+           help="force operation even if the working copy is not clean"),
 ]
 
 common_opts = [

[prev in list] [next in list] [prev in thread] [next in thread]