That's on the client, not the server, right? What version of patch is on the server?
Christian -- Christian Hammond - [email protected] Review Board - http://www.reviewboard.org VMware, Inc. - http://www.vmware.com On Wed, Dec 16, 2009 at 7:43 PM, qhlonline <[email protected]> wrote: > > I am using the TortoiseCVS as CVS client, I am not sure what kind of diff > it support, But my diff command is using as "cvs diff -uN ...". Can you > please recommand me some GNU-diff-supported CVS client run on Windows OS? > Thanks. > > Best Regards! > > 在2009-12-17，"Christian Hammond" <[email protected]> 写道： > > What version of diff is on the Windows install? It must specifically use > GNU diff, and not some other diff tool. > > Christian > > -- > Christian Hammond - [email protected] > Review Board - http://www.reviewboard.org > VMware, Inc. - http://www.vmware.com > > > On Wed, Dec 16, 2009 at 7:27 PM, qhlonline <[email protected]> wrote: > >> Hi, Christian, >> Now that is the different diff file contents of the same file change: >> On Windows: >> WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW >> Index: abc.c >> =================================================================== >> RCS file: /export/home/cvsroot/test/abc.c,v >> retrieving revision 1.1 >> diff -u -r1.1 abc.c >> --- abc.c 2009/12/17 02:37:24 1.1 >> +++ abc.c 2009/12/17 02:43:08 >> @@ -2,6 +2,7 @@ >> #include <stdlib.h> >> int main() >> { >> + printf("Begin, Begin!"); >> print("Hello World!"); >> if(a==5) >> { >> @@ -11,4 +12,5 @@ >> { >> printf("Hi,sir!"); >> } >> + printf("Hello, Sir!"); >> } >> WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW >> And on Linux: >> LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL >> Index: abc.c >> =================================================================== >> RCS file: /export/home/cvsroot/test/abc.c,v >> retrieving revision 1.1 >> diff -u -r1.1 abc.c >> --- abc.c 2009/12/17 02:37:24 1.1 >> +++ abc.c 2009/12/17 02:50:30 >> @@ -2,6 +2,7 @@ >> #include <stdlib.h> >> int main() >> { >> + printf("Begin, Begin!"); >> print("Hello World!"); >> if(a==5) >> { >> @@ -11,4 +12,5 @@ >> { >> printf("Hi,sir!"); >> } >> -} >> \ No newline at end of file >> + printf("Hello, Sir!"); >> +} >> LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL >> There is no much difference. But the linux diff file ends with a warning: >> "\ No newline at end of file" and the end Brace"}" has been viewed as a >> change: + and -; This kind of format diff file works well, The Reviewer can >> open the "view diff" correctly. But the windows diff file format, which gave >> no warning and view the last brace as unchanged, with this format, The >> Reviewers clicking "view diff" will report error as in the first message of >> this topic I have pointed. And infect I have never add any new-line to the >> end of the source code file: neither the original file, nore the chenged >> files in both Operating System. >> And If I had manualy add a blank new line in the changed file in >> Windows local source code file, I will get the same diff file content as >> that of linux said above, And that may slove this problem. But I don't know >> why. and How to fundamentally solve the problem? >> >> Best Regards! >> >> >> 在2009-12-16，"Christian Hammond" <[email protected]> 写道： >> >> I don't really know what you mean, but I know that many companies using >> Review Board have clients on Linux, Windows and Mac who post to a Review >> Board server on Linux without any problems. I'd have to see some diffs and >> original source files where this fails to have an idea as to what's going >> wrong. >> >> Christian >> >> -- >> Christian Hammond - [email protected] >> Review Board - http://www.reviewboard.org >> VMware, Inc. - http://www.vmware.com >> >> >> On Tue, Dec 15, 2009 at 7:55 PM, JohnHenry <[email protected]> wrote: >> >>> I have viewed the diff file of both Windows and Linux, It seems that >>> not only they have difference between there "NewLine" character, There >>> are some file format difference but I am not sure, Can any one give a >>> description of there difference? >>> >>> Best Regards! >>> >>> On Dec 15, 4:09 pm, JohnHenry <[email protected]> wrote: >>> > OK, The first problem is that I have Created new ReviewRequest in >>> > WindowsOS through Web UI while the RB Server is on Linux. When I use >>> > post-review in linux to create new ReviewRequest , That will be fine. >>> > But I had not test the windowsOS post-review generated new >>> > ReviewRequest now. >>> > But the second problem, How to make Review to the review request >>> > generated with newly source code( that is the source code has never >>> > been commited to CVS ) is waiting for suggestion. >>> > >>> > Best Regards! >>> > >>> > On 12月15日, 下午3时36分, JohnHenry <[email protected]> wrote: >>> > >>> > >>> > >>> > > Hi, >>> > > I have tried to post a review request and publish it using one >>> > > User, But in the Reviewers' UI, when He cilck the "view diff" link on >>> > > the top-right, There will be some error infomation: >>> > > ************************************************** >>> > > The patch to 'mySouceTest.c' didn't apply cleanly. The temporary >>> files >>> > > have been left in '/tmp/reviewboard.zX0n4M' for debugging purposes. >>> > > `patch` returned: patching file /tmp/reviewboard.zX0n4M/tmphNZpB0 >>> > > patch: **** malformed patch at line 25: - exit(1); >>> > >>> > > Traceback (most recent call last): >>> > > File >>> "/data1/John1/bin/develop_tools/python/python2.5/lib/python2.5/ >>> > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ >>> > > views.py", line 153, in view_diff >>> > > interdiffset, highlighting, True) >>> > > File >>> "/data1/John1/bin/develop_tools/python/python2.5/lib/python2.5/ >>> > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ >>> > > diffutils.py", line 623, in get_diff_files >>> > > large_data=True) >>> > > File >>> "/data1/qiaohl/bin/develop_tools/python/python2.5/lib/python2.5/ >>> > > site-packages/Djblets-0.5.6-py2.5.egg/djblets/util/misc.py", line >>> 162, >>> > > in cache_memoize >>> > > data = lookup_callable() >>> > > File >>> "/data1/John1/bin/develop_tools/python/python2.5/lib/python2.5/ >>> > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ >>> > > diffutils.py", line 622, in <lambda> >>> > > enable_syntax_highlighting), >>> > > File >>> "/data1/John1/bin/develop_tools/python/python2.5/lib/python2.5/ >>> > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ >>> > > diffutils.py", line 345, in get_chunks >>> > > new = get_patched_file(old, filediff) >>> > > File >>> "/data1/John1l/bin/develop_tools/python/python2.5/lib/python2.5/ >>> > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ >>> > > diffutils.py", line 261, in get_patched_file >>> > > return patch(filediff.diff, buffer, filediff.dest_file) >>> > > File >>> "/data1/John1/bin/develop_tools/python/python2.5/lib/python2.5/ >>> > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ >>> > > diffutils.py", line 129, in patch >>> > > (filename, tempdir, patch_output)) >>> > > Exception: The patch to 'myUCMobile.c' didn't apply cleanly. The >>> > > temporary files have been left in '/tmp/reviewboard.zX0n4M' for >>> > > debugging purposes. >>> > > `patch` returned: patching file /tmp/reviewboard.zX0n4M/tmphNZpB0 >>> > > patch: **** malformed patch at line 25: - exit(1); >>> > > ******************************************************************* >>> > > Need suggestion. >>> > > And, If I want to make a new reivewrequest with a new file that has >>> > > never been commited to CVS repository before ,The info would be as >>> > > follows: >>> > > >>> ------------------------------------------------------------------------------>>> >>> Review request draft saved >>> > > >>> Uploading diff, size: 50 >>> > > >>> HTTP POSTing tohttp:// >>> 192.168.3.20:8080/api/json/reviewrequests/9/diff/new/:{}<http://192.168.3.20:8080/api/json/reviewrequests/9/diff/new/:%7B%7D> >>> > > >>> {"fields": {"path": ["The diff file is empty"]}, "stat": "fail", >>> "err": {"msg": "One or more fields had errors", "code": 105}} >>> > >>> > > Error uploading diff: One or more fields had errors (105)>>> >>> {'fields': {'path': ['The diff file is empty']}, 'stat': 'fail', 'err': >>> {'msg': 'One or more fields had errors', 'code': 105}} >>> > >>> > > Your review request still exists, but the diff is not attached >>> > > >>> -------------------------------------------------------------------------------------------- >>> > > In that case , Can the reviewer see the source code in the new file >>> of >>> > > ReviewRequestor's any way? >>> > >>> > > Best Regards!- Hide quoted text - >>> > >>> > - Show quoted text - >>> >>> -- >>> Want to help the Review Board project? Donate today at >>> http://www.reviewboard.org/donate/ >>> Happy user? Let us know at http://www.reviewboard.org/users/ >>> -~----------~----~----~----~------~----~------~--~--- >>> To unsubscribe from this group, send email to >>> [email protected]<reviewboard%[email protected]> >>> For more options, visit this group at >>> http://groups.google.com/group/reviewboard?hl=en >>> >> >> -- >> Want to help the Review Board project? Donate today at >> http://www.reviewboard.org/donate/ >> Happy user? Let us know at http://www.reviewboard.org/users/ >> -~----------~----~----~----~------~----~------~--~--- >> To unsubscribe from this group, send email to reviewboard+ >> [email protected] >> For more options, visit this group at >> http://groups.google.com/group/reviewboard?hl=en >> >> >> >> -- >> Want to help the Review Board project? Donate today at >> http://www.reviewboard.org/donate/ >> Happy user? Let us know at http://www.reviewboard.org/users/ >> -~----------~----~----~----~------~----~------~--~--- >> To unsubscribe from this group, send email to >> [email protected]<reviewboard%[email protected]> >> For more options, visit this group at >> http://groups.google.com/group/reviewboard?hl=en >> > > -- > Want to help the Review Board project? Donate today at > http://www.reviewboard.org/donate/ > Happy user? Let us know at http://www.reviewboard.org/users/ > -~----------~----~----~----~------~----~------~--~--- > To unsubscribe from this group, send email to reviewboard+ > [email protected] > For more options, visit this group at > http://groups.google.com/group/reviewboard?hl=en > > > > -- > Want to help the Review Board project? Donate today at > http://www.reviewboard.org/donate/ > Happy user? Let us know at http://www.reviewboard.org/users/ > -~----------~----~----~----~------~----~------~--~--- > To unsubscribe from this group, send email to > [email protected]<reviewboard%[email protected]> > For more options, visit this group at > http://groups.google.com/group/reviewboard?hl=en > -- Want to help the Review Board project? Donate today at http://www.reviewboard.org/donate/ Happy user? Let us know at http://www.reviewboard.org/users/ -~----------~----~----~----~------~----~------~--~--- 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
