1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
--- orig/commands.py
+++ mod/commands.py
@@ -1337,7 +1337,8 @@
def set_title(self, command=None):
try:
- version = self.tree.tree_version.nonarch
+ version = pylon.alias_or_version(self.tree.tree_version, self.tree,
+ full=False)
except:
version = "[no version]"
if command is None:
@@ -1983,7 +1984,11 @@
version)
if len(new_merges) > 0:
if cmdutil.prompt("Log for merge"):
- mergestuff = cmdutil.log_for_merge(tree, comp_version)
+ if cmdutil.prompt("changelog for merge"):
+ mergestuff = "Patches applied:\\n"
+ mergestuff += pylon.changelog_for_merge(new_merges)
+ else:
+ mergestuff = cmdutil.log_for_merge(tree, comp_version)
log.description += mergestuff
log.save()
try:
|
