bugmonotone - Bugs: bug #13417, diff_patch.cc (j->len ===>...

 
 

You are not allowed to post comments on this tracker with your current authentication level.

bug #13417: diff_patch.cc (j->len ===> j->type ???)

Submitted by:  None
Submitted on:  Thu 16 Jun 2005 05:32:33 AM UTC  
 
Category: merge algorithmSeverity: 3 - Normal
Item Group: code cleanupStatus: Fixed
Privacy: PublicAssigned to: None
Open/Closed: Closed
mtn version --full: 

monotone-0.19

Thu 16 Jun 2005 05:32:33 AM UTC, original submission:

I've noticed only lexically. But isn't it a bug ?

Here's a patch.

<pre>
diff -ur a/monotone-0.19/diff_patch.cc b/monotone-0.19/diff_patch.cc
--- a/monotone-0.19/diff_patch.cc 2005-05-03 09:51:27.000000000 +0900
+++ b/monotone-0.19/diff_patch.cc 2005-06-16 14:02:49.683684136 +0900
@@ -319,7 +319,7 @@
}

// mutual or single-edge deletes
- else if ((i->type == deleted && j->len == deleted)
+ else if ((i->type == deleted && j->type == deleted)
|| (i->type == deleted && j->type == preserved)
|| (i->type == preserved && j->type == deleted))
{
</pre>

Anonymous

 

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

Do you think this task is very important?
If so, you can click here to add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.

 

Please enter the title of George Orwell's famous dystopian book (it's a date):

 

 

Follow 2 latest changes.

Date Changed By Updated Field Previous Value => Replaced By
Wed 29 Jun 2005 06:16:39 AM UTCnjsStatusNone=>Fixed
  Open/ClosedOpen=>Closed

Back to the top


Powered by Savane 3.1-cleanup1