[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Re: [Subclipse-dev] [svnclientadapter] Generating a diff for a renamed file as a full delete-create

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 5 Oct 2011 08:31:06 -0400

Consumers of a patch have no knowledge how it was created, so as long
as you produce a valid file that reviewboard can consume I do not
think there can be any issues.

On Wed, Oct 5, 2011 at 8:06 AM, Robert Munteanu
<robert.munteanu_at_gmail.com> wrote:
> Mark,
>
> Thank you for your reply. I am considering working around this issue by manually generating the diff for 'added' files to always contain the standard header and each line in the file prefixed with '+'. Do you see any potential issues with this approach?
>
> Thanks,
>
> Robert
>
>> We are not involved in the actual diff process, we just call the API.
>> The Subversion command line has the same issue.
>>
>> The SVN 1.7 command line adds some new options to help with this.  If
>> they are exposed in the Java API then they can be exposed in
>> svnClientAdapter.
>>
>>
>>
>> On Wed, Oct 5, 2011 at 7:02 AM, Robert Munteanu
>> <robert dot munteanu at gmail dot com> wrote:
>> > Hi,
>> >
>> > I am developing an Eclipse plugin (
>> > https://github.com/rombert/ereviewboard ) which will offer Subclipse
>> > integration . This integration mainly involves posting a diff to a
>> > remote code review server.The single case which I am unable to handle
>> > correctly is a renamed file. When renaming a Java class, named Second:
>> >
>> > package com.example;
>> >
>> > public class Second {
>> >
>> > }
>> >
>> > to Third:
>> >
>> > package com.example;
>> >
>> > public class Third {
>> >
>> > }
>> >
>> > I would expect the diff to show that Second.java has all lines deleted
>> > and Third.java has all lines added. While Second.java does have all
>> > lines deleted, Third.java only has a diff from Second.java:
>> >
>> > Index: src/com/example/Third.java
>> > ===================================================================
>> > --- src/com/example/Third.java  (revision 2)
>> > +++ src/com/example/Third.java  (working copy)
>> > @@ -1,5 +1,5 @@
>> >  package com.example;
>> >
>> > -public class Second {
>> > +public class Third {
>> >
>> >  }
>> >
>> > I am currently using  svnClient.createPatch(changes,
>> > _project.getLocation().toFile(), tmpFile, false) to generate the diff,
>> > but have experimented with svnClient.diff as well, with no success.
>> >
>> > What are my options of generating a delete-create diff for a renamed file?
>> >
>> > Thanks,
>> >
>> > Robert
>> >
>> > --
>> > Sent from my (old) computer
>> >
>> > ------------------------------------------------------
>> > http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=2850181
>> >
>> > To unsubscribe from this discussion, e-mail: [dev-unsubscribe at subclipse dot tigris dot org].
>> >
>>
>>
>>
>> --
>> Thanks
>>
>> Mark Phippard
>> http://markphip.blogspot.com/
>
> ------------------------------------------------------
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=2850192
>
> To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_subclipse.tigris.org].
>

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=2850196
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_subclipse.tigris.org].
Received on 2011-10-05 14:31:12 CEST

This is an archived mail posted to the Subclipse Dev mailing list.