← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patches_data/patchtext.patch

  • Committer: Aaron Bentley
  • Date: 2006-05-30 03:51:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: aaron.bentley@utoronto.ca-20060530035103-1828900762221412
Removed confusing text from the test module

Show diffs side-by-side

added added

removed removed

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