What is the output of 'svn help diff'? -David
On Fri, Jun 27, 2014 at 1:45 PM, James Oravec <[email protected]> wrote: > Hi Christian, > > We've upgrade one of our source repositories from CVS to SVN. I'm trying > to post to reviewboard and am getting a similar issue as what is stated in > this thread. I'm hoping you might be able to give me some suggestions. I've > posted the question to stack overflow too. > > I'm trying to use reviewboard with SVN. Others in the office have got > their system setup and are able to post (copies of a VM that got it working > the first time). I've compared my system setup against theirs and things > look the same, as far as I can tell. > > When I run the rbt post command I get: > > Failed to execute command: ['svn', 'diff', '--diff-cmd=diff', > '--notice-ancestry ', '-r', 'BASE'] ['Index: main.cpp\n', > '========================================================= ==========\n', > 'Usage: diff [OPTIONS] \n', '\n', 'Display the dif ferences between and in > unified diff\n', "format. OPTIONS are d iff extensions as described by 'svn > help diff'.\n", "Use '--' alone to indicate that no more options > follow.\n", "svn: E200012: 'diff' returned 2\n"] > > I've made my svn client and gnu diff the first two things in my system > path: C:\Program Files (x86)\GnuWin32\bin;C:\Program Files (x86)\CollabNet > > I'm running Windows 8 machine. > > Some detail. svn --version gives: > > svn, version 1.8.9 (r1591380) compiled Jun 6 2014, 03:53:07 on > x86-microsoft-windows5.1.2600 > > Copyright (C) 2014 The Apache Software Foundation. This software consists > of contributions made by many people; see the NOTICE file for more > information. Subversion is open source software, see > http://subversion.apache.org/ > > The following repository access (RA) modules are available: > > - ra_svn : Module for accessing a repository using the svn network > protocol. > - with Cyrus SASL authentication > - handles 'svn' scheme > - ra_local : Module for accessing a repository on local disk. > - handles 'file' scheme > - ra_serf : Module for accessing a repository via WebDAV protocol > using serf. > - using serf 1.3.4 > - handles 'http' scheme > - handles 'https' scheme > > diff --version gives: > > diff (GNU diffutils) 2.8.7 Written by Paul Eggert, Mike Haertel, David > Hayes, Richard Stallman, and Len Tower. > > Copyright (C) 2004 Free Software Foundation, Inc. This is free software; > see the source for copying conditions. There is NO warranty; not even for > MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > > Any thoughts or ideas on what I should check or what I'm missing? I'm > going to post to the google group too to see if they have any ideas, if > they have a solution I'll update this post too. > Thanks, > James > > > > > > > > On Tuesday, November 13, 2012 12:03:38 PM UTC-8, Christian Hammond wrote: > >> It's just possible svn diff no longer supports the --diff option. I'm not >> at a computer right now, but does it appear at all in the help output? >> >> Christian >> >> >> On Nov 13, 2012, at 11:40, "rb" <[email protected]> wrote: >> >> > >> > We have another user with this strange svn diff issue with post-review. >> I >> > somehow got past this issue, completely by accident. Any help on >> resolution >> > would be appreciated. >> > >> > Mark >> > >> > On Tue, October 30, 2012 9:49 am, rb wrote: >> >> On Tue, October 30, 2012 3:40 am, Christian Hammond wrote: >> >>> What happens if you run: >> >>> >> >>> svn diff --diff-cmd=diff >> >>> >> >>> directly? >> >>> >> >>> Christian >> >>> >> >>> -- >> >>> Christian Hammond - [email protected] >> >>> Review Board - http://www.reviewboard.org >> >>> VMware, Inc. - http://www.vmware.com >> >> >> >> >> >> Christian, >> >> >> >> It is the same as the output from post-review debug. If I remove GNU >> diff from >> >> first in the path, post-review complains about not having GNU diff. >> >> >> >> Mark >> >> >> >> +++++++++++++++++++++++++++++++++++++++= >> >> >> >> >> >> C:\workareas\svn\test\rb-test > svn up >> >> >> >> Updating '.': >> >> >> >> At revision 83. >> >> >> >> >> >> C:\workareas\svn\test\rb-test > svn stat -u >> >> >> >> M 83 test.txt >> >> >> >> Status against revision: 83 >> >> >> >> >> >> C:\workareas\svn\test\rb-test > svn diff test.txt >> >> >> >> Index: test.txt >> >> >> >> =================================================================== >> >> >> >> --- test.txt (revision 83) >> >> >> >> +++ test.txt (working copy) >> >> >> >> @@ -1,3 +1,4 @@ >> >> >> >> +test test >> >> >> >> save this cahnge >> >> >> >> nire >> >> >> >> owewew >> >> >> >> >> >> C:\workareas\svn\test\rb-test > post-review --debug >> >> >> >>>>> RBTools 0.4.2 >> >> >> >>>>> Python 2.7.3 (default, Apr 10 2012, 23:31:26) [MSC v.1500 32 bit >> (Intel)] >> >> >> >>>>> Running on Windows-7-6.1.7601-SP1 >> >> >> >>>>> Home = C:\Users\user1\AppData\Roaming >> >> >> >>>>> Current Directory = C:\workareas\svn\test\rb-test >> >> >> >>>>> Checking the repository type. Errors shown below are mostly >> harmless. >> >> >> >> DEBUG:root:Checking for a CVS repository... >> >> >> >> DEBUG:root:Checking for a ClearCase repository... >> >> >> >> DEBUG:root:Checking for a Git repository... >> >> >> >> DEBUG:root:Checking for a Mercurial repository... >> >> >> >> DEBUG:root:Checking for a Perforce repository... >> >> >> >> DEBUG:root:Checking for a Plastic repository... >> >> >> >> DEBUG:root:Checking for a Subversion repository... >> >> >> >> DEBUG:root:Running: svn info >> >> >> >> DEBUG:root:Running: diff --version >> >> >> >> DEBUG:root:repository info: Path: >> >> https://svn-srvr/svn/proj_tpc_tca_test-comp-a, Base path: >> >> /rel-branches/release_1.0_rc5, Supports changesets: False >> >> >> >>>>> Finished checking the repository type. >> >> >> >>>>> HTTP GETting api/ >> >> >> >>>>> HTTP GETting https://rb-srvr/rb/s/test_project_c/api/info/ >> >> >> >>>>> Using the new web API >> >> >> >> DEBUG:root:Running: svn diff --diff-cmd=diff >> >> >> >> Failed to execute command: ['svn', 'diff', '--diff-cmd=diff'] >> >> >> >> ['Index: test.txt\n', >> >> '===================================================================\n', >> >> >> 'Usage: diff [OPTIONS] <file1> <file2>\n', '\n', 'Display the >> differences >> >> between <file1> and <file2> in unified diff\n', "format. OPTIONS are >> diff >> >> extensions as described by 'svn help diff'.\n", "Use '--' alone to >> indicate >> >> that no more options follow.\n", "svn: E200012: 'diff' returned 2\n"] >> >> >> >> >> >> >> >> C:\workareas\svn\test\rb-test > diff --version >> >> >> >> diff (GNU diffutils) 2.8.7 >> >> >> >> Written by Paul Eggert, Mike Haertel, David Hayes, >> >> >> >> Richard Stallman, and Len Tower. >> >> >> >> Copyright (C) 2004 Free Software Foundation, Inc. >> >> >> >> This is free software; see the source for copying conditions. There >> is NO >> >> >> >> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR >> PURPOSE. >> >> >> >> >> >> >> >> C:\workareas\svn\test\rb-test > svn --version >> >> >> >> svn, version 1.7.5 (r1336830) >> >> >> >> compiled May 11 2012, 03:17:57 >> >> >> >> Copyright (C) 2012 The Apache Software Foundation. >> >> >> >> This software consists of contributions made by many people; see the >> NOTICE >> >> >> >> file for more information. >> >> >> >> Subversion is open source software, see http://subversion.apache.org/ >> >> >> >> The following repository access (RA) modules are available: >> >> >> >> * ra_neon : Module for accessing a repository via WebDAV protocol >> using Neon. >> >> >> >> - handles 'http' scheme >> >> >> >> - handles 'https' scheme >> >> >> >> * ra_svn : Module for accessing a repository using the svn network >> protocol. >> >> >> >> - with Cyrus SASL authentication >> >> >> >> - handles 'svn' scheme >> >> >> >> * ra_local : Module for accessing a repository on local disk. >> >> >> >> - handles 'file' scheme >> >> >> >> * ra_serf : Module for accessing a repository via WebDAV protocol >> using serf. >> >> >> >> - handles 'http' scheme >> >> >> >> - handles 'https' scheme >> >> >> >> >> >> C:\workareas\svn\test\rb-test > svn diff --diff-cmd=diff >> >> >> >> Index: test.txt >> >> >> >> =================================================================== >> >> >> >> Usage: diff [OPTIONS] <file1> <file2> >> >> >> >> Display the differences between <file1> and <file2> in unified diff >> >> >> >> format. OPTIONS are diff extensions as described by 'svn help diff'. >> >> >> >> Use '--' alone to indicate that no more options follow. >> >> >> >> svn: E200012: 'diff' returned 2 >> >> >> >> >> >> C:\workareas\svn\test\rb-test > svn propget reviewboard:url >> >> >> >> https://rb-srvr/rb/s/test_project_c >> >> >> >> >> >> >> >> C:\workareas\svn\test\rb-test > svn info >> >> >> >> Path: . >> >> >> >> Working Copy Root Path: C:\workareas\svn\test\rb-test >> >> >> >> URL: >> >> https://svn-srvr/svn/proj_tpc_tca_test-comp-a/rel-branches/ >> release_1.0_rc5 >> >> >> >> Repository Root: https://svn-srvr/svn/proj_tpc_tca_test-comp-a >> >> >> >> Revision: 83 >> >> >> >> Node Kind: directory >> >> >> >> Schedule: normal >> >> >> >> Last Changed Author: testuser1 >> >> >> >> Last Changed Rev: 83 >> >> >> >> Last Changed Date: 2012-10-30 10:19:47 -0400 (Tue, 30 Oct 2012) >> >> >> >> >> >> >> >> -- >> >> 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 >> > >> > >> > -- >> > 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...@ >> googlegroups.com >> > For more options, visit this group at http://groups.google.com/ >> group/reviewboard?hl=en >> > >> > >> > -- > Get the Review Board Power Pack at http://www.reviewboard.org/powerpack/ > --- > Sign up for Review Board hosting at RBCommons: https://rbcommons.com/ > --- > > Happy user? Let us know at http://www.reviewboard.org/users/ > --- > You received this message because you are subscribed to the Google Groups > "reviewboard" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/d/optout. > -- Get the Review Board Power Pack at http://www.reviewboard.org/powerpack/ --- Sign up for Review Board hosting at RBCommons: https://rbcommons.com/ --- Happy user? Let us know at http://www.reviewboard.org/users/ --- You received this message because you are subscribed to the Google Groups "reviewboard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
