Tortoise SVN doesn't generate compatible diffs. Try svn diff.

Christian

-- 
Christian Hammond - chip...@chipx86.com
Review Board - http://www.review-board.org
VMware, Inc. - http://www.vmware.com


On Thu, Jul 2, 2009 at 3:48 PM, Henrike Coelho <henrike.coe...@gmail.com>wrote:

> Hi Roman, doesn't work for me.
>
> -I've created a patch with tortoise svn and created a new review request
> -I've moved the diff file to bin directory in apache folder (and restarted
> the server just in case)
> -The same error still happens.
>
> suggestions? I don't understand which is the really issue related with
> output...
>
> On Thu, Jul 2, 2009 at 7:25 PM, roman <mario.ro...@gmail.com> wrote:
>
>>
>> Hi Guy,
>>  Inspite of having the patch included in my path, I had to copy the
>> patch to the apache bin directory. This is not an elegant solutions,
>> but it works :).
>>
>>
>>
>> On 30 jun, 19:32, Henrike Coelho <henrike.coe...@gmail.com> wrote:
>> > Hi Christian,
>> >
>> > humm I've tried to do that, however without success :( the error still
>> > happens. patch-2.5.9-7-setup I've installed this version, do you know
>> any
>> > issue with this version (python 2.5)? Can you give me an idea how can i
>> > generate diff files compatible with review board?
>> >
>> > On Tue, Jun 30, 2009 at 1:20 AM, Christian Hammond <chip...@chipx86.com
>> >wrote:
>> >
>> >
>> >
>> >
>> >
>> > > Yeah, TortoiseSVN definitely won't work. They generate slightly
>> > > incompatible diffs. We might be able to work around it at some point,
>> but
>> > > someone would probably have to contribute a patch for that.
>> >
>> > > However, the "the system cannot find the file specified" error is
>> > > definitely Apache not finding patch.exe.
>> >
>> > > Maybe try rebooting? :)
>> >
>> > > Christian
>> >
>> > > --
>> > > Christian Hammond - chip...@chipx86.com
>> > > Review Board -http://www.review-board.org
>> > > VMware, Inc. -http://www.vmware.com
>> >
>> > > On Mon, Jun 29, 2009 at 4:52 PM, henriquecoelho <
>> henrike.coe...@gmail.com>wrote:
>> >
>> > >> I should add that the diff file was generated with tortoisesvn,
>> > >> creating a patch... Is there any known issue creating the diff in
>> this
>> > >> way?
>> >
>> > >> On 30 Jun, 00:37, Christian Hammond <chip...@chipx86.com> wrote:
>> > >> > GNU patch.exe must be in the path for this to work. It appears that
>> it's
>> > >> not
>> > >> > able to find this.
>> >
>> > >> > Christian
>> >
>> > >> > --
>> > >> > Christian Hammond - chip...@chipx86.com
>> > >> > Review Board -http://www.review-board.org
>> > >> > VMware, Inc. -http://www.vmware.com
>> >
>> > >> > On Mon, Jun 29, 2009 at 4:33 PM, henriquecoelho <
>> > >> henrike.coe...@gmail.com>wrote:
>> >
>> > >> > > Hi all,
>> >
>> > >> > > I'm having a problem viewing the diff file that i've upload in
>> new
>> > >> > > review request. I've activated the debug level for reviewboard
>> and i'm
>> > >> > > getting the following output when i access to view diff in right
>> top
>> > >> > > corner:
>> >
>> > >> > > [Error 2] The system cannot find the file specified
>> >
>> > >> > > Traceback (most recent call last):
>> > >> > >  File "c:\python25\lib\site-packages\ReviewBoard-1.0-py2.5.egg
>> > >> > > \reviewboard\diffviewer\views.py", line 152, in view_diff
>> > >> > >    interdiffset, highlighting, True)
>> > >> > >  File "c:\python25\lib\site-packages\ReviewBoard-1.0-py2.5.egg
>> > >> > > \reviewboard\diffviewer\diffutils.py", line 623, in
>> get_diff_files
>> > >> > >    large_data=True)
>> > >> > >  File
>> "c:\python25\lib\site-packages\Djblets-0.5-py2.5.egg\djblets
>> > >> > > \util\misc.py", line 143, in cache_memoize
>> > >> > >    data = lookup_callable()
>> > >> > >  File "c:\python25\lib\site-packages\ReviewBoard-1.0-py2.5.egg
>> > >> > > \reviewboard\diffviewer\diffutils.py", line 622, in <lambda>
>> > >> > >    enable_syntax_highlighting),
>> > >> > >  File "c:\python25\lib\site-packages\ReviewBoard-1.0-py2.5.egg
>> > >> > > \reviewboard\diffviewer\diffutils.py", line 345, in get_chunks
>> > >> > >    new = get_patched_file(old, filediff)
>> > >> > >  File "c:\python25\lib\site-packages\ReviewBoard-1.0-py2.5.egg
>> > >> > > \reviewboard\diffviewer\diffutils.py", line 261, in
>> get_patched_file
>> > >> > >    return patch(filediff.diff, buffer, filediff.dest_file)
>> > >> > >  File "c:\python25\lib\site-packages\ReviewBoard-1.0-py2.5.egg
>> > >> > > \reviewboard\diffviewer\diffutils.py", line 109, in patch
>> > >> > >    stderr=subprocess.STDOUT)
>> > >> > >  File "C:\Python25\Lib\subprocess.py", line 594, in __init__
>> > >> > >    errread, errwrite)
>> > >> > >  File "C:\Python25\Lib\subprocess.py", line 822, in
>> _execute_child
>> > >> > >    startupinfo)
>> > >> > > WindowsError: [Error 2] The system cannot find the file specified
>> >
>> > >> > > I'm not sure if this is sufficiently clear to you but if someone
>> havy
>> > >> > > an ideia about this please let me know how to workaround this. I
>> think
>> > >> > > that this could be due the problem with diff file so the steps
>> that i
>> > >> > > made to upload the new review diff file were:
>> >
>> > >> > > -New review request
>> > >> > > -choose the repository (example in my case)
>> > >> > > -base diff path : /
>> > >> > > -diff: c:\example\
>> >
>> > >> > > The diff file:
>> >
>> > >> > > Index: Apache2/conf/httpd.conf
>> > >> > >
>> ===================================================================
>> > >> > > --- Apache2/conf/httpd.conf     (revision 3)
>> > >> > > +++ Apache2/conf/httpd.conf     (working copy)
>> > >> > > @@ -467,4 +467,29 @@
>> > >> > >        AllowOverride All
>> > >> > >  </Directory>
>> >
>> > >> > > +<<<<<<< .mine
>> > >> > > +#<Location /moopion>
>> > >> > > +#  Order deny,allow
>> > >> > > +#  Allow from all
>> > >> > > +#</Location>
>> > >> > > +
>> > >> > > +#Alias /moopion "C:\example\source\example\web"
>> > >> > > +
>> > >> > > +#<Directory "C:\example\source\example\web">
>> > >> > > +#  AllowOverride All
>> > >> > > +#</Directory>
>> > >> > > +
>> > >> > > +<Location /sso>
>> > >> > > +  Order deny,allow
>> > >> > > +  Allow from all
>> > >> > > +</Location>
>> > >> > > +
>> > >> > > +Alias /sso "C:\example\source\sso\webdir"
>> > >> > > +
>> > >> > > +<Directory "C:\example\source\sso\webdir">
>> > >> > > +  AllowOverride All
>> > >> > > +</Directory>
>> > >> > > +
>> > >> > > +=======
>> > >> > > +>>>>>>> .r3
>> > >> > >  AllowEncodedSlashes On
>> >
>> > >> > > Thanks in advance. Please if you need some specific further
>> > >> > > information, let me know.
>> >
>> > --
>> > Cumprimentos
>> >
>> > Henrike Coelho
>> > mail:henrike.coe...@gmail.com <mail%3ahenrike.coe...@gmail.com> <
>> mail%3ahenrike.coe...@gmail.com <mail%253ahenrike.coe...@gmail.com>>
>> >      a40...@alunos.uminho.pt
>> > site:http://hcc.wedevso.com
>> > Universidade Minho- Ocultar texto de la cita -
>> >
>> > - Mostrar texto de la cita -
>>
>>
>>
>
>
> --
> Cumprimentos
>
> Henrike Coelho
> mail:henrike.coe...@gmail.com <mail%3ahenrike.coe...@gmail.com>
>      a40...@alunos.uminho.pt
> site: http://hcc.wedevso.com
> Universidade Minho
>
> >
>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To post to this group, send email to reviewboard@googlegroups.com
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to