Rev 3089: Update NEWS in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Dec 6 23:53:16 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3089
revision-id:pqm at pqm.ubuntu.com-20071206235308-1ol3uk5sbttviy3e
parent: pqm at pqm.ubuntu.com-20071206191512-6tvqmou1db89q6oi
parent: abentley at panoramicfeedback.com-20071206180943-0wpbj8hqqe376rjx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-12-06 23:53:08 +0000
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.18
revision-id:abentley at panoramicfeedback.com-20071206180943-0wpbj8hqqe376rjx
parent: abentley at panoramicfeedback.com-20071206175230-tpie138cj9z92yp5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-12-06 13:09:43 -0500
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.17
revision-id:abentley at panoramicfeedback.com-20071206175230-tpie138cj9z92yp5
parent: abentley at panoramicfeedback.com-20071206140235-3syamg5s5w64e0uo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-12-06 12:52:30 -0500
message:
Add debugging flag for merges
modified:
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.16
revision-id:abentley at panoramicfeedback.com-20071206140235-3syamg5s5w64e0uo
parent: aaron.bentley at utoronto.ca-20071204031351-oqfar0izq3i4w0wo
parent: pqm at pqm.ubuntu.com-20071206135045-uhim2fpy9d2n4esa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-12-06 09:02:35 -0500
message:
merge bzr.dev
added:
doc/en/quick-reference/quick-start-summary.png quickstartsummary.pn-20071203142852-hsiybkmh37q5owwe-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
doc/en/quick-reference/quick-start-summary.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/merging_changes.txt merging_changes.txt-20071122141511-0knao2lklsdsvb1q-3
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/working_offline_central.txt working_offline_cent-20071123055134-k5x4ekduci2lbn36-5
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
=== modified file 'NEWS'
--- a/NEWS 2007-12-06 18:20:35 +0000
+++ b/NEWS 2007-12-06 23:53:08 +0000
@@ -34,6 +34,8 @@
* New -Dhttp debug option reports http connections, requests and responses.
(Vincent Ladeuil)
+ * New -Dmerge debug option, which emits merge plans for merge-type=weave.
+
BUGFIXES:
* Better error message when running ``bzr cat`` on a non-existant branch.
=== modified file 'bzrlib/debug.py'
--- a/bzrlib/debug.py 2007-11-30 16:48:24 +0000
+++ b/bzrlib/debug.py 2007-12-06 17:52:30 +0000
@@ -34,5 +34,6 @@
* http - trace http connections, requests and responses
* index - trace major index operations
* lock - trace when lockdir locks are taken or released
+ * merge - emit information for debugging merges
"""
=== modified file 'bzrlib/help_topics.py'
--- a/bzrlib/help_topics.py 2007-12-04 00:34:34 +0000
+++ b/bzrlib/help_topics.py 2007-12-06 17:52:30 +0000
@@ -272,6 +272,7 @@
-Dhpss Trace smart protocol requests and responses.
-Dindex Trace major index operations.
-Dlock Trace when lockdir locks are taken or released.
+-Dmerge Emit information for debugging merges.
"""
_standard_options = \
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py 2007-12-04 03:52:13 +0000
+++ b/bzrlib/merge.py 2007-12-06 17:52:30 +0000
@@ -20,6 +20,7 @@
import warnings
from bzrlib import (
+ debug,
errors,
osutils,
patiencediff,
@@ -993,6 +994,12 @@
and conflicts.
"""
plan = self.this_tree.plan_file_merge(file_id, self.other_tree)
+ if 'merge' in debug.debug_flags:
+ plan = list(plan)
+ trans_id = self.tt.trans_id_file_id(file_id)
+ name = self.tt.final_name(trans_id) + '.plan'
+ contents = ('%10s|%s' % l for l in plan)
+ self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
'>>>>>>> MERGE-SOURCE\n')
return textmerge.merge_lines(self.reprocess)
More information about the bazaar-commits
mailing list