From 1da274c54037898e191f9b8dd8dcfeb303f98154 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 21 Jun 2012 15:01:16 +0200 Subject: [PATCH] cosmetic, changed 'trunk' for 'master' in docstrings and help msgs --- module-tools.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module-tools.py b/module-tools.py index 99c160b7..2a10dd30 100755 --- a/module-tools.py +++ b/module-tools.py @@ -955,7 +955,7 @@ that for other purposes than tagging""" % options.workdir if not prompt ("No pending difference in module %s, want to tag anyway"%self.pathname,False): return - # side effect in trunk's specfile + # side effect in head's specfile self.patch_spec_var(spec_dict) # prepare changelog file @@ -1367,11 +1367,11 @@ module-tools : a set of tools to manage subversion tags and specfile * define *version* and *taglevel* OR alternatively * define redirection variables module_version_varname / module_taglevel_varname -Trunk: - by default, the trunk of modules is taken into account +Master: + by default, the 'master' branch of modules is the target in this case, just mention the module name as Branches: - if you wish to work on a branch rather than on the trunk, + if you wish to work on another branch, you can use something like e.g. Mom:2.1 as """ release_usage="""Usage: %prog [options] tag1 .. tagn -- 2.47.0