svn diff problem

[Szekeres Istvan <sz...@pulsussoft.hu>]

Hello,
                                                                                        
I ran into a problem with svn diff. As far as I know, this should work,
but it doesn't.
                                                                                        
I had a current (updated) working copy of trunk, and I made a
modification to a file. Then I decided to create a new branch for these
changes, so I copied my working copy to a new branch. Then I wanted to
compare the branch with the trunk but svn said:
                                                                                        
svn: Syntax error parsing revision '(something)'.
                                                                                        
This is a script to reproduce what I did (using two branches instead of
trunk and a branch):
                                                                                        
R=svn+ssh://sz@server/home/sz/svnrepos/branches/sz  # global repo. root
A=$R/a   # this is where I work
B=$R/b   # this is where I will copy my modified work to
                                                                                        
# note: $R already exists, $A and $B not.
                                                                                        
svn mkdir -m 'created a' $A
svn co $A
cd a
echo 'a' > x.txt
svn add x.txt
svn commit -m 'added x.txt' x.txt
rm x.txt
echo 'b' > x.txt
svn cp -m 'copy wc to B' . $B
svn diff $A $B
==>
svn: Syntax error parsing revision
'server/home/sz/svnrepos/branches/sz/a'
                                                                                        
however, both $A and $B can be accessed:
                                                                                        
$ svn cat $A/x.txt
a
$ svn cat $B/x.txt
b
                                                                                        
any ideas what the problem can be?
                                                                                        
Thanks,
Istvan
                                                                                        
                                                                                        

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: svn diff problem

[Erik Huelsmann <e....@gmx.net>]

Hi,

I don't know if what you try to do actually should work (like copying from
your wc to the repository), but what definitely won't work is comparing 2
resources without telling svn which revision to use for it.

Which means that in the transcript below you should use

svn diff $a@2 $b@2 

where the @2 means that you want the state of the resource as in revision 2
of the repository.

bye,

Erik.

> R=svn+ssh://sz@server/home/sz/svnrepos/branches/sz  # global repo. root
> A=$R/a   # this is where I work
> B=$R/b   # this is where I will copy my modified work to
>                                                                           
>              
> # note: $R already exists, $A and $B not.
>                                                                           
>              
> svn mkdir -m 'created a' $A
> svn co $A
> cd a
> echo 'a' > x.txt
> svn add x.txt
> svn commit -m 'added x.txt' x.txt
> rm x.txt
> echo 'b' > x.txt
> svn cp -m 'copy wc to B' . $B
> svn diff $A $B
> ==>
> svn: Syntax error parsing revision
> 'server/home/sz/svnrepos/branches/sz/a'
>                                                                           
>              
> however, both $A and $B can be accessed:
>                                                                           
>              
> $ svn cat $A/x.txt
> a
> $ svn cat $B/x.txt
> b
>                                                                           
>              
> any ideas what the problem can be?
>                                                                           
>              
> Thanks,
> Istvan
>                                                                           
>              
>                                                                           
>              
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
> 

-- 
+++ NEU bei GMX und erstmalig in Deutschland: TÜV-geprüfter Virenschutz +++
100% Virenerkennung nach Wildlist. Infos: http://www.gmx.net/virenschutz


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org