Merge pull request #6 from fmdaboville/master

Add log line for scm tag
ralfth · May 27, 2021 · 6346d4d · 6346d4d
2 parents 560e22f + a7f6c1a
commit 6346d4d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/mergepom.py b/mergepom.py
@@ -120,6 +120,7 @@ def get_project_version(f):
 if (current_branch_version is not None and (keep or branch != 'master')):
         print('Merging pom version ' + other_branch_version + ' into ' + branch + '. Keeping version ' + current_branch_version)
         git_merge_res_str = change_version(other_branch_version, current_branch_version, git_merge_res_str)
+        print('Merging pom scm tag ' + other_tag + ' into ' + branch + '. Keeping scm tag ' + current_tag) if have_tags else 0
         git_merge_res_str = change_tag(other_tag, current_tag, git_merge_res_str) if have_tags else git_merge_res_str
 
 with codecs.open(sys.argv[2], 'w', enc) as f: