diff options
| author | W. Trevor King <wking@drexel.edu> | 2009-07-21 16:33:28 -0400 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2009-07-21 16:33:28 -0400 |
| commit | 885b04b50ad3bbde81ec2eccfbfb2e516d0d3a80 (patch) | |
| tree | 794458babd1aa824b3e343291f6c5f2d7704f27f /becommands/merge.py | |
| parent | 19fc927cf959005a71813ca702fc6c1aa28d3a92 (diff) | |
| parent | 86d74730ded314d960e0465f2eb50e5fb66c4767 (diff) | |
| download | bugseverywhere-885b04b50ad3bbde81ec2eccfbfb2e516d0d3a80.tar.gz | |
Merged assorted changes from be.wtk-rr for BugDir.extra_strings.
Other highlights:
* be show --no-comments
* Improved *.sync_with_disk.
* Improved be-mbox-to-xml.
Diffstat (limited to 'becommands/merge.py')
| -rw-r--r-- | becommands/merge.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/becommands/merge.py b/becommands/merge.py index c7cae2b..8e1fd50 100644 --- a/becommands/merge.py +++ b/becommands/merge.py @@ -22,6 +22,7 @@ def execute(args, manipulate_encodings=True): """ >>> from libbe import utility >>> bd = bugdir.simple_bug_dir() + >>> bd.set_sync_with_disk(True) >>> a = bd.bug_from_shortname("a") >>> a.comment_root.time = 0 >>> dummy = a.new_comment("Testing") @@ -35,7 +36,6 @@ def execute(args, manipulate_encodings=True): >>> dummy.time = 1 >>> dummy = dummy.new_reply("1 2 3 4") >>> dummy.time = 2 - >>> bd.save() >>> os.chdir(bd.root) >>> execute(["a", "b"], manipulate_encodings=False) Merging bugs a and b @@ -141,13 +141,13 @@ def execute(args, manipulate_encodings=True): bugB.load_comments() mergeA = bugA.new_comment("Merged from bug %s" % bugB.uuid) newCommTree = copy.deepcopy(bugB.comment_root) - for comment in newCommTree.traverse(): + for comment in newCommTree.traverse(): # all descendant comments comment.bug = bugA - for comment in newCommTree: + comment.save() # force onto disk under bugA + for comment in newCommTree: # just the child comments mergeA.add_reply(comment, allow_time_inversion=True) bugB.new_comment("Merged into bug %s" % bugA.uuid) bugB.status = "closed" - bd.save() print "Merging bugs %s and %s" % (bugA.uuid, bugB.uuid) def get_parser(): |