Rev 4603: Record the known related bugs. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4603
revision-id: v.ladeuil+lp at free.fr-20090901161507-blghtjjy9ezsiw41
parent: v.ladeuil+lp at free.fr-20090831141207-zpuzyrtazmqmh1gb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Tue 2009-09-01 18:15:07 +0200
message:
  Record the known related bugs.
  
  * Outline.txt: 
  (Related bugs): Keep track of the already known related bugs.
-------------- next part --------------
=== modified file 'Outline.txt'
--- a/Outline.txt	2009-08-13 13:10:48 +0000
+++ b/Outline.txt	2009-09-01 16:15:07 +0000
@@ -1,3 +1,17 @@
+Related Bugs:
+=============
+
+https://bugs.edge.launchpad.net/bzr/+bug/414589
+
+https://bugs.edge.launchpad.net/bzr/+bug/236724
+https://bugs.edge.launchpad.net/bzr/+bug/228506
+https://bugs.edge.launchpad.net/bzr/+bug/113809
+https://bugs.edge.launchpad.net/bzr/+bug/322767
+https://bugs.edge.launchpad.net/bzr/+bug/416903
+
+https://bugs.edge.launchpad.net/bzr/+bug/405264
+
+
 TODO:
 =====
 
@@ -88,10 +102,12 @@
 Text conflicts:
 ---------------
 
-3 ways:
-- force THIS
-- force OTHER
+5 ways:
+- force THIS (for all conflicted regions)
+- force OTHER (for all conflicted regions)
 - manually solve each conflicted region
+- force THIS (overriding all cleanly merged modifications)
+- force OTHER (overriding all cleanly merged modifications)
 
 resolve:
 - delete .THIS, .OTHER, .BASE  if present