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? -- Johan
