Rev 4713: Try always dumping a conflict file if you have content to put in it. in http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

------------------------------------------------------------
revno: 4713
revision-id: john at arbash-meinel.com-20091207231019-ii5h5mwq790fect7
parent: john at arbash-meinel.com-20091204040211-7a2ki1g5y2rbmq89
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0-40412-show-base-weave
timestamp: Mon 2009-12-07 17:10:19 -0600
message:
  Try always dumping a conflict file if you have content to put in it.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2009-12-04 00:59:09 +0000
+++ b/bzrlib/merge.py	2009-12-07 23:10:19 +0000
@@ -1287,7 +1287,7 @@
         versioned = False
         file_group = []
         for suffix, tree, lines in data:
-            if file_id in tree:
+            if file_id in tree or lines is not None:
                 trans_id = self._conflict_file(name, parent_id, tree, file_id,
                                                suffix, lines, filter_tree_path)
                 file_group.append(trans_id)