| Summary | Horde_Text_Diff_ThreeWay does not render |
| Queue | Horde Framework Packages |
| Queue Version | Git master |
| Type | Bug |
| State | Resolved |
| Priority | 1. Low |
| Owners | jan (at) horde (dot) org |
| Requester | jmargolin (at) digitalspy (dot) co (dot) uk |
| Created | 09/27/2011 (5033 days ago) |
| Due | |
| Updated | 10/11/2011 (5019 days ago) |
| Assigned | |
| Resolved | 10/11/2011 (5019 days ago) |
| Github Issue Link | |
| Github Pull Request | |
| Milestone | |
| Patch | No |
This doesn't have anything to do with the Horde_Text_Diff class, so
don't extend it (
Bug #10548). Fix phpdoc.1 files changed, 9 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/f78320f714f0366da9b3cb4925344f4fd2c85fb4
Assigned to Jan Schneider
State ⇒ Resolved
Version ⇒ Git master
Horde_Text_Diff_ThreeWay is to make a 3-way *merge*. This works now,
see the new unit test for usage examples.
Fix class names (
Bug #10548).4 files changed, 6 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/01b46f51b977102102d6b45d7312e31f8856d4ad
Add test for Horde_Text_Diff_ThreeWay which is actually 3-way-merge
(
Bug #10548).2 files changed, 58 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/86b0418a3124618d22cf55cb70b7df2b95ffdfba
Priority ⇒ 1. Low
Type ⇒ Bug
Summary ⇒ Horde_Text_Diff_ThreeWay does not render
Queue ⇒ Horde Framework Packages
Milestone ⇒
Patch ⇒ No
State ⇒ Unconfirmed
1. In /ThreeWay/BlockBuilder.php line 49 refers to
Horde_Text_Diff_ThreeWay_Op which is a class that does not exist, this
was the first issue we encountered and should be referencing
Horde_Text_Diff_ThreeWay_Op_Base we think.
2. Using the native engine and the unified renderer the diff does not
seem to work.
$diff = new Horde_Text_Diff_ThreeWay($lines1, $lines2, $lines3);
$renderer = new Horde_Text_Diff_Renderer_Unified();
echo $renderer->render($diff);
This will not not render anything apart from the blockHeader.