Sorry, this is the e-mail client we have here at work. I'm not a fan of it, but its what we have to use.
I want to thank you for solving the problem. The svn diff syntax you provided works exactly as expected. I would suggest adding this to the online subversion manual at http://svnbook.red-bean.com/en/1.7/index.html. "At this point, the wise thing to do is look at the changes carefully with svn diff, and then build and test your branch." It would be useful to mention the syntax of the svn diff command here so that user's can see exactly how to do it. I think it would save a lot of developers time. Thank you very much. for your help. I had spent an entire day trying to figure it out. Now it seems so easy once you showed me. Thank you. Joneric Wennerstrom / Sr Programmer/Anlyst-Specialized Systems / Engineering & Factory Systems Support MS 188-400, 221 3rd Ave SE , Cedar Rapids, IA, 52401, USA Phone: 319-263-4597 / Fax: 319-263-6067 jwenn...@rockwellcollins.com www.rockwellcollins.com From: Johan Corveleyn <jcor...@gmail.com> To: jwenn...@rockwellcollins.com Cc: users@subversion.apache.org Date: 06/29/2012 09:14 AM Subject: Re: svn diff of working copy file to unrelated branch file [ Replying back to the users@ list. Please use 'reply all' to keep the discussion on the list. Also, if possible, please use plain text emails, and do not top post (i.e. put your reply at the bottom of the thing you're replying to, or inline). More below ... ] > On Thu, Jun 28, 2012 at 10:59 PM, <jwenn...@rockwellcollins.com> wrote: > > > > Here is the scenario: > > > > User 1 > > 1. create branches/X > > 2. svn checkout branches/X to local machine > > 3. modify file.txt > > 4. commit changes > > > > > > Another user, User 2, > > 5. create branches/Y > > 6. svn checkout branches/Y to his local machine > > 7. merge branches/X to local machine (and thus merges file.txt > > into branches/Y) > > 8. use svn diff to verify that the changes to file.txt in the local > > copy of branches/Y succeeded before committing the change. > > > > > > Since svn diff can not compare the local working copy to that of a URL, > > this is impossible to do without first committing the change to branches/Y. > > I don't understand. If you want to see what has changed, after the > merge, to file.txt in your working copy of branches/Y, 'svn diff > file.txt' should do the trick, no? > On Fri, Jun 29, 2012 at 3:43 PM, <jwenn...@rockwellcollins.com> wrote: > > Yes, of course, svn diff shows me the changes that have been merged in to > my local working copy. > But that is not what my question is asking. > > I want to compare two versions of file.txt. > The one in branches/X and the one in my working copy. > svn diff does not allow me to compare a path and a url. > So, I can not do the following: > > /branches/Y>svn diff file.txt http://repository/branches/X/file.txt > > So I have no way of verifying if the changes merged in to my local working > copy are correct. > > There are lots of work arounds like: > 1. check out branches/X to my drive and then compare two paths > 2. commit the changes to my working copy and then compare two urls > > Neither of these are reasonable solutions. I think this should work: svn diff --old=http://repository/branches/X/file.txt --new=file.txt (i.e. the 2nd usage if you look at 'svn help diff') -- Johan
<<image/gif>>
