mailRe: [task #7404] Support for XYZ structure files.


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by Edward d'Auvergne on June 10, 2011 - 11:02:
Hi,

Unfortunately the patch file does not apply cleanly.  I see the following:

[edward@localhost xyz]$ patch -p0 < patch
patching file test_suite/system_tests/structure.py
Hunk #1 FAILED at 632.
Hunk #2 FAILED at 648.
2 out of 2 hunks FAILED -- saving rejects to file
test_suite/system_tests/structure.py.rej
[edward@localhost xyz]$

Looking at the patch file, I can see that there are modifications that
were committed in revision r12946.  You will need to perform an 'svn
up' and then make a new patch file.  Check that the file contains only
the modification you made.

Cheers,

Edward



On 10 June 2011 10:46, Han Sun <hasu@xxxxxxxxxxxxxxxxx> wrote:
The commit message:
Changed paths:
   M /branches/xyz/test_suite/system_tests/structure.py
Modifying the function test 'test_read_xyz_internal1()'.
This is Han's patch https://gna.org/task/download.php?file_id=13146 attached
to the task
http://gna.org/task/?7404.
In the 'test_read_xyz_internal1()' option parser='internal' has been
removed.

On Jun 10, 2011, at 10:42 AM, Han Sun wrote:

Additional Item Attachment, task #7404 (project relax):
File name: patch                          Size:1 KB

    _______________________________________________________
Reply to this item at:
  <http://gna.org/task/?7404>
_______________________________________________
  Message sent via/by Gna!
  http://gna.org/





Related Messages


Powered by MHonArc, Updated Fri Jun 10 11:20:12 2011