List Info

Thread: Re: Viewing differences in file after name change




Re: Viewing differences in file after name change
user name
2007-04-20 09:32:32
Thank you for the response, but I am still confused on
how a peg-revision applies to my case in subcommander.

The subVersion documentation on peg revisions gives an
example of two files with the same name that have
different content for different revs.  My example is 
two files with the same content but different names.

--- Martin Hauner <haunerweb.de> wrote:


> > If not then how do I specify the old file name??
> 
> The trick here is to use the "peg" revision.
If you
> set it to
> 11 and the start rev to 10 and the end rev to 11 it
> should work.

>From the command line if I type...

svn diff -r 10:11 newFileName

Index: oldFileName
=====================================================
--- oldFileName (.../oldFileName)       (revision 10)
+++ oldFileName (.../newFileName)       (revision 11)





NOW what is interesting is if I do

svn cat newFileName10

THEN I get the same error messages I get in
subCommander...

svn: PROPFIND request failed on 

'/svn/myRepos/!svn/bc/10/trunk/Source/newFileName'
path not found.




> The peg revision tells subversion that the given
> item (newFileName)
> exists in revision 11. Subversion will now track the
> history of
> newFileName to find out how it was named in rev 10
> and will then
> run a coorect diff between oldFileName at rev 10 and
> newFileName
> at rev 11.

How do I do this in the diff dialog within
subCommander??
New Target and Target Peg Revision seem to be mutually
exclusive options. If I put 10 in the Target Peg
Revision  then how do I specify the oldFileName?

Thank you
Mike


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection
around 
http://mail.yahoo.com 

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubcommander.tigris.org
For additional commands, e-mail: dev-helpsubcommander.tigris.org


Re: Viewing differences in file after name change
user name
2007-04-22 07:22:40
Hi,

mgarrfl wrote:
> Thank you for the response, but I am still confused on
> how a peg-revision applies to my case in subcommander.
> 
> The subVersion documentation on peg revisions gives an
> example of two files with the same name that have
> different content for different revs.  My example is 
> two files with the same content but different names.

It applies to renames too.
The example in the subversion book (chapter 7, Peg and
Operative
Revisions) also talks about renamed files.

When you run

 > svn diff -r 10:11 newFileName

subversion is internally running

 > svn diff -r 10:11 newFileNameBASE

the BASE being the peg revision.

Subcommander isn't that clever at the moment. Looking at the
svn source
this magic is happening inside the svn command line tool and
not in the
api. Since subcommander is running against the api, it
doesn't
automatically add the peg revision. You have to explicitly
add it by
selecting it in the dialog.

I will add the magic to the next version, i didn't know it
existed ;)

-- 
Martin

Subcommander 1.2.2 - http://subcommander.ti
gris.org
a cross platform Win32/Unix/MacOSX subversion GUI client
& diff/merge tool.

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubcommander.tigris.org
For additional commands, e-mail: dev-helpsubcommander.tigris.org


[1-2]

about | contact  Other archives ( Real Estate discussion Medical topics )