forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Gav...." <brightoncomput...@brightontown.com.au>
Subject RE: SVN diffs (Re: [jira] Commented: (FOR-639) define terminology for the various aspects of Dispatcher)
Date Sun, 23 Apr 2006 13:30:28 GMT


> -----Original Message-----
> From: Ross Gardler [mailto:rgardler@apache.org]
> Sent: Sunday, 23 April 2006 9:16 PM
> To: dev@forrest.apache.org
> Subject: SVN diffs (Re: [jira] Commented: (FOR-639) define terminology for
> the various aspects of Dispatcher)
> 
> Gav.... wrote:
> ..
> 
> >
> > I did this on the voice plugin and all looks good apart from a couple of
> > things.
> >
> > 1. I renamed a file and it does not show up in the diff.
> > 2. I added a file and that does not show up in the diff.
> 
> When renaming a file you should use the "svn move" command. If you
> rename using the operating system commands you end up with a deletion
> and an addition and this loses the files history.

Ok, thanks, I did do this 'move' in the end. (After re-naming the file
Back again.)

> 
> Diffs will only show if you have actually deleted or added a file to the
> svn repository with "svn delete|add". In other words if you do "rm
> foo.xml" a subsequent "svn diff" will not so a difference, but doing
> "svn status" will show the file is missing. Equally if you create a new
> file but do not "svn add" it, "svn diff" will not show anything but "svn
> status" will show a file exists locally but not remotely.
> 
> In summary, you have to tell SVN about changes like additions and
> delitions explicitly.
> 
> > So should I for
> >
> > 1. Do an SVN add for the new file and SVN delete for the old file
> > 2. Do an SVN add.
> 
> No that is a move:
> 
> "svn move foo.xml bar.xml"
> 
> This will retain the history of foo.xml in the new bar.xml file.

Thanks, 1. was a move and 2. was an add.

And hopefully it shows in the diff properly now.

Gav...

> 
> Ross
> 
> 
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.385 / Virus Database: 268.4.5/322 - Release Date: 22/04/2006



Mime
View raw message