List Info

Thread: Viewing differences in file after name change




Viewing differences in file after name change
user name
2007-04-13 09:34:23
I committed a filename change and wanted to run a diff
between the current revision and the previous
revision.

To do a name change I changed the name of the file in
the folder view of the working copy. After a reload
there was an 'A' for the newFileName and a 'D' for the
oldFileName. I then committed this change.

To view differences I run a log on the working copy of
newFileName (after turning off the 'Stop on Copy'
checkbox). I right-click the current version (rev 11
in my case) and select 'diff..'. I verifed the diff
'target from revision' is 10 AND the 'target to
revision' is 11.

After hitting the diff button an error message
appears..

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

It appears to be looking for the new file name in the
previous revision...

Is this a bug?
If not then how do I specify the old file name??

(I even tried..

http://localhost:8
080/svn/myRepos/!svn/bc/10/trunk/Source/oldFileName

in the new target option)

Thanks,
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-15 02:17:53
Hi,

mgarrfl wrote:
> I committed a filename change and wanted to run a diff
> between the current revision and the previous
> revision.
> 
> To do a name change I changed the name of the file in
> the folder view of the working copy. After a reload
> there was an 'A' for the newFileName and a 'D' for the
> oldFileName. I then committed this change.
> 
> To view differences I run a log on the working copy of
> newFileName (after turning off the 'Stop on Copy'
> checkbox). I right-click the current version (rev 11
> in my case) and select 'diff..'. I verifed the diff
> 'target from revision' is 10 AND the 'target to
> revision' is 11.
> 
> After hitting the diff button an error message
> appears..
> 
> '/svn/myRepos/!svn/bc/10/trunk/Source/newFileName'
> path not found.
> 
> It appears to be looking for the new file name in the
> previous revision...

Correct.. you told it too by setting the start revision to
10.

> Is this a bug?

No, because subversion uses delete and add to rename an
item.
And the new name is not available in the previous revision.

Although you could consider using a delete/add rename a
bug.
I think subversion plans to implement "true"
renames without
delete/add.

> 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.

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.

-- 
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 )