Hey guys, Svn actually does a unidiff (Unified Contextual Diff). The following line actually denotes a chunk of change in the files being diffed @@ -someRange, +someRange @@
where, someRange = startingLineNumber, noOfLines the first range (starting with - sign) is the chunk of change in the first file and the second (starting with the + sign) is for the second file. Its pretty easy to understand once you start to compare the files yourself. I too would advise using a GUI client (if you want a standalone client for svn ofcourse), when you work on big code bases. I tried WorkBench, RapidSvn but SmartSVN beats everything as it has some really cool features like caching the logs and all. And the Conflict Solver is also pretty solid too. So, check it out. More info : http://www.syntevo.com/smartsvn/download.html FYI, The foundation version is free and it has pretty much all the features that you will ever need. -- Cheers, John On Jan 16, 2008 5:11 PM, Satish Vellanki <[EMAIL PROTECTED]> wrote: > --- In [email protected] <twincling%40yahoogroups.com>, Bunny > Shankar <[EMAIL PROTECTED]> wrote: > > > > Hi, > > > > How do i read svn diff? > > > > This is a java code i have removed origanal code and written some junk. > > > > In the given below code, how do i know what is the svn diff. what > does @@ specify. '+' and '-' indicate added and deleted? Please let me > know. > > > > @@ -105,11 +112,15 @@ > > sadsadsa; > > sdsadsasa; > > dsasa; > > - aaa; > > + aasads; > > dsfdsfds; > > dsfsadsa; > > > > - dsfdsadsa; > > + sadsadsaa; > > + asdsa; > > + sadsadsa; > > + sadsadsa; > > + dsadsad; > > sadsadsadsa; > > sdsadsadsa; > > sadsadsa; > > > > Hi Bunny Shankar, > Thou I am not sure what @@ means in the svn diff output, a - means > that this line has been removed from working copy while a + means it > has been added to the working copy. > See > http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.3.2 > for some more info. > > With the help of a GUI diff tool you can understand it better. > > Hope this helps. > > -- > Satish > http://www.cs.ttu.edu/~savellan/ > >
