I'm having trouble finding instructions on explicitly using gnu diff
while still preserving repo information. How do I work it into say
'svn diff -r 12:13 >testdiff' or a post-review.py call?
In the mean time I get the same error when running 'svn diff -r 12:13
>testdiff' in my working directory and posting 'by hand' (new review
request) then looking at the 'view diff' page.
The contents of the temp files are:
hello.c.diff:
-------------------------------------------
Index: source/hello.c
===================================================================
--- source/hello.c (revision 12)
+++ source/hello.c (revision 13)
@@ -8,4 +8,3 @@
printf("Another revision");
return;
}
-
------------------------------------------- (single trailing newline
in hello.c.diff)
tmpyfic-n:
-------------------------------------------
#include <stdio.h>
#include "hello.h"
// changing to test codestriker
int main(void)
{
printf("There are %d months in a year", TWELVE);
printf("Another revision");
return;
}
------------------------------------------- (double trailing newline
in tmpyfic-n)
On Dec 19 2008, 4:29 am, "Muhammad Haggag" <[email protected]> wrote:
> When that happened to me, I went to the temp directory and examined
> the files myself. In my case, it turned out that my source control
> system mishandled files that didn't have trailing newlines
> incorrectly, and produced diffs that gnu patch didn't understand.
> Using gnu diff solved my problem (It adds a "\No newline at end of
> file" lines at the problematic spots, which patch understands).
>
> If you're unable to resolve your problem, try to reproduce it with
> some dummy files that are safe to share, and post your temporary files
> here.
>
>
>
> On Thu, Dec 18, 2008 at 11:28 PM, SamClark <[email protected]> wrote:
>
> > I've been browsing other posts about this but I haven't been able to
> > make heads or tails of them. In short when I navigate to my project
> > working copy and run
>
> > ' > post-review.py --revision-range=11:12 --server=http://
> > my.reviewboard.server:port'
>
> > The script completes successfully and spits out the url of the posted
> > review. When I go there and try to 'view diff' I get a page with:
>
> > ---------------------------------------------------------------------------------------------------------------------------------------------------------------------
> > ---------------------------------------------------------------------------------------------------------------------------------------------------------------------
>
> > The patch to '/Firmware/Projects/Hello/branches/
> > Hello_b_1_0_0_TestReview/source/hello.c' didn't apply cleanly. The
> > temporary files have been left in 'c:\docume~1\sclark\locals~1\temp
> > \reviewboard.phaidc' for debugging purposes. `patch` returned:
>
> > Traceback (most recent call last):
> > File "c:\svn\reviewboard\diffviewer\views.py", line 86, in view_diff
> > files = get_diff_files(diffset, None, interdiffset, highlighting)
> > File "c:\svn\reviewboard\diffviewer\diffutils.py", line 654, in
> > get_diff_files
> > enable_syntax_highlighting)
> > File "c:\svn\reviewboard\diffviewer\diffutils.py", line 573, in
> > generate_files
> > large_data=True)
> > File "C:\SVN\reviewboard\djblets\util\misc.py", line 142, in
> > cache_memoize
> > data = lookup_callable()
> > File "c:\svn\reviewboard\diffviewer\diffutils.py", line 572, in
> > <lambda>
> > enable_syntax_highlighting),
> > File "c:\svn\reviewboard\diffviewer\diffutils.py", line 339, in
> > get_chunks
> > new = get_patched_file(old, filediff)
> > File "c:\svn\reviewboard\diffviewer\diffutils.py", line 255, in
> > get_patched_file
> > return patch(filediff.diff, buffer, filediff.dest_file)
> > File "c:\svn\reviewboard\diffviewer\diffutils.py", line 125, in
> > patch
> > (filename, tempdir, patch_output))
> > Exception: The patch to '/Firmware/Projects/Hello/branches/
> > Hello_b_1_0_0_TestReview/source/hello.c' didn't apply cleanly. The
> > temporary files have been left in 'c:\docume~1\sclark\locals~1\temp
> > \reviewboard.phaidc' for debugging purposes.
> > `patch` returned:
>
> > ---------------------------------------------------------------------------------------------------------------------------------------------------------------------
> > ---------------------------------------------------------------------------------------------------------------------------------------------------------------------
>
> --
> Muhammad Haggag
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"reviewboard" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/reviewboard?hl=en
-~----------~----~----~----~------~----~------~--~---
