1023: svn-generated diff causes traceback

joe.m******@gmai***** (Google Code) (Is this you? Claim this profile.)
Feb. 6, 2010 
What's the URL of the page containing the problem?
http://codereview.corp.yahoo.com/r/3448/diff/#index_header

What steps will reproduce the problem?
1. syn diff svn+ssh://svn.corp.yahoo.com/yahoo/tools/deploy/igor/trunk
svn+ssh://svn.corp.yahoo.com/yahoo/tools/deploy/igor/branches/2.0.36_bug_2516114>~/diffs/showhide.diff


2. Remove property diffs (which ALSO makes codereview barf) in showhide.diff

3. attach same as diff to yahoo/tools/deploy/igor

What is the expected output? What do you see instead?

I expected to get a diff page. I get a traceback saying the diff is bad.
What operating system are you using? What browser?


Please provide any additional information below.
showhide.diff 
Index: server/pkg/igor_web.yicf
===================================================================
--- server/pkg/igor_web.yicf	(.../trunk)	(revision 2697)
+++ server/pkg/igor_web.yicf	(.../branches/2.0.36_bug_2516114)	(revision 2697)
@@ -45,10 +45,11 @@
 c - - - conf/webctl/webctl.conf    ../conf/webctl.conf overwrite template
 
 c - - - conf/yapache/include/igor_web.conf  ../conf/igor_web.conf   template overwrite
+
+find 444 - - share/htdocs/igor/             ../static/ -name *.js
 f - - - share/htdocs/igor/igor.gif          ../static/igor.gif
 f - - - share/htdocs/igor/banner.jpg        ../static/banner.jpg
 f - - - share/htdocs/igor/igor.css          ../static/igor.css
-f - - - share/htdocs/igor/igorflip.js       ../static/igorflip.js
 f - - - share/htdocs/igor/igor_client.html  ./igor_client.html
 
 # we don't need to run a post commit hook at all now, but leave here
@@ -202,4 +203,3 @@
 YINST set rolesdb_timeout   600
 
 EOF
->>>>>>> .merge-right.r2602
Index: server/t/responses
david
#1 david 
It's not really possible for us to figure this out with the diff supplied. If you can 
replicate this on a publically available server, please post a comment.
  • +Incomplete
#2 joe.m******@gmai***** (Google Code) (Is this you? Claim this profile.) 
Sorry - I wish I could replicate this for you; I'm no longer at Yahoo!.