bugmonotone - Bugs: bug #8715, malformed patch produced by...

 
 

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

bug #8715: malformed patch produced by monotone diff

Submitted by:  Derek Scherger <dscherger>
Submitted on:  Wed 28 Apr 2004 04:24:00 AM UTC  
 
Category: command line UISeverity: 3 - Normal
Item Group: incorrect behaviorStatus: Fixed
Privacy: PublicAssigned to: Richard Levitte <rlevitte>
Open/Closed: Closed
mtn version --full: 

Thu 02 Sep 2004 02:50:25 PM UTC, comment #2:

That's because unidiff_hunk_writer::flush_hunk seems to think it should write a trailer context if the lines describing the change is smaller than the amount of requested context lines (hardcoded to 3 here).

Since the first change in schema.sql is only 1 line (since you removed the first line, which is empty), flush_hunk though it would be wise not to output any trailer...

I've just committed a change that fixes this as well as another misbehavior in diff (it didn't calculate the skew correctly). Please try it out.

Richard Levitte <rlevitte>
Project AdministratorIn charge of this item.
Wed 28 Apr 2004 04:30:57 AM UTC, comment #1:

stupid enter key/web browser behaviour is killing me.

the attached patch was made with monotone diff > foobar.diff
against version d286dfc7a2c02c2adb4024cd3ea84b8a01df211c

this diff contains the results of my local hacking and has lots of probably bad changes in it... don't look to closely at the contents

when I attempt to apply this patch to a clean working copy at version d286dfc7a2c02c2adb4024cd3ea84b8a01df211c with patch -p0 < foobar.patch I get the following output

patching file app_state.cc
patching file cert.cc
patching file cert.hh
patching file commands.cc
patching file database.cc
patching file diff_patch.cc
patching file file_io.cc
patching file file_io.hh
patching file monotone.cc
patching file monotone.texi
patching file schema.sql
patch: **** malformed patch at line 973: @@ -17,6 +16,8 @@

Derek Scherger <dscherger>
Project Member
Wed 28 Apr 2004 04:24:00 AM UTC, original submission:
Derek Scherger <dscherger>
Project Member

 

Attached Files
file #1260:  foobar.diff added by dscherger (34KiB - text/x-patch - diff from monotone that causes patch problems)

 

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 5 latest changes.

Date Changed By Updated Field Previous Value => Replaced By
Thu 25 Nov 2004 03:46:08 PM UTCrlevitteOpen/ClosedIn Test=>Closed
Thu 02 Sep 2004 02:50:25 PM UTCrlevitteStatusNone=>Fixed
  Assigned toNone=>rlevitte
  Open/ClosedOpen=>In Test
Wed 28 Apr 2004 04:30:57 AM UTCdschergerAttached File-=>Added foobar.diff, #1245

Back to the top


Powered by Savane 3.1-cleanup1