Compare with history does not work after copying a file

tomasn
Posts: 5
Joined: Tue Oct 10, 2006 10:35 am

Compare with history does not work after copying a file

Postby tomasn » Tue Oct 10, 2006 10:59 am

It seems like comparing a file with a previous version in the
repository does not work properly if it has been copied to a
new directory. I copy the file by right clicking it in the
Package Explorer and then selecting Team->Copy To. I then do
some small changes to the file in the new location.

If I then do Team->Synchronize with Repository it does not show
the previous remote version of the file but instead has an empty
right pane saying that the remote file is unversioned.

Also I can not do Compare With->Revision for the changed file
since that menu item is disabled.

If I check in the file in the new location I am able to compare
it with any previous revision, also past the point where it was
copied to a new folder. Obviously I want to be able to do this
comparison with the previous version before check in of the
modified file in the new location.

I have tried this using both Subversion 1.0.3 and 1.1M5 with
Eclipse 3.2.1 with the same result.

Is this a known bug or am I doing something wrong?

/Tomas

tomasn
Posts: 5
Joined: Tue Oct 10, 2006 10:35 am

Postby tomasn » Fri Oct 13, 2006 7:41 am

Is this working for everybody else since I get no answer here. We want to switch from using CVS to using Subversion with the Subversive plug-in in Eclipse. One of the main reasons for doing this is to get the ability to keep the history when moving a file to a new directory.

Can someone please confirm if they have gotten this to work or if it is not supposed to work.

/Tomas

Elena Matokhina
Posts: 29
Joined: Thu Sep 14, 2006 7:31 am

Postby Elena Matokhina » Fri Oct 13, 2006 9:49 am

Dear tomasn,

Thank you for being interested in Subversive project. First of all - you can be sure that Subversive keeps the resources history after copying and moving them to another location. You are doing everything right, but until you commit the file you can't compare it with previous revision - as it is not on repository yet. That is also the reason why the 'Compare with->Revision' menu item is disabled and synchronize shows that remote file is unversioned.
But your expectation that the file can be compared with any revision is understandable, so we'll investigate possible solutions.
As for current solution - to preview local changes you can select both the copy of the file and the initial file and choose 'Compare With->Each Other'.
Best regards,
Elena Matokhina
Polarion Team

NimdaCinatas
Posts: 6
Joined: Fri Oct 13, 2006 1:08 pm
Location: Sauerland, Germany

Postby NimdaCinatas » Fri Oct 13, 2006 1:21 pm

Hi Elena,

I've a similar problem after moving content via "Refactor -> move to".

Diffs/compares against any older version don't work but all comments against this older versions are displayed in "Resource History".

The diffs do work from commandline via "svn diff <rev1>:<rev2> <URL of current (new) revision>".

I'm using subversive v1.1.0M5/Eclipse v3.2.1/SVN v1.3.2 ...

Would be nice to here from you (or some other members :wink:).

Best regards,
Nimda

tomasn
Posts: 5
Joined: Tue Oct 10, 2006 10:35 am

Postby tomasn » Fri Oct 13, 2006 3:06 pm

Dear Elena,

Thank you for the answer. I saw that the file kept its history and
that you could compare it with previous versions after commiting
the file to the repository. To us it is important that you can do
this before commiting the file however.

To understand why this is important I can explain a typical workflow
we have here for you.

1. A developer makes a large refactoring in his sandbox moving many
classes between packages and also making some smaller changes to
the classes while doing this.

2. Before commiting the files to the repository we always have a
"code review" where another developer inspects the changes made.

3. We do this code review using Team Synchronize->Synchronize with repository
to see the changes made to the outgoing files.

A nice fix would be if the "synchronize diff" could automatically
show what you can achieve with "Compare With->Each Other" for the
file in its old and new location for files that have been copied
to a new location. Although "Compare With->Each Other" can be used
it is cumbersome to do when you have made changes to hundreds of
classes and need to manually select the class in the old and
new location.

Also note that

svn diff

on the command line gives me the information I expect after using
Team->Copy To with the Subversive plug-in. It shows me the diff for
the file compared to its "old" location even though I have not yet
commited it in the new location.

Some way of getting this information easily for all the changed
files in a local sandbox where lots of files have changed would
be very much appreciated. I can imagine that a lot of other users
would like this functionality as well.

One of the main reasons for us to move from CVS to Subversion is
the ability to keep the history when making large refactorings
including moving files to new locations and to be able to inspect
changes during the code review. I hope you will be able to provide
a fix for this soon.


Best regards,

Tomas Normark

Elena Matokhina
Posts: 29
Joined: Thu Sep 14, 2006 7:31 am

Postby Elena Matokhina » Tue Oct 17, 2006 10:16 am

Hello, Tomas and Nimda

Our current solution was investigated as it had been promised.
Of course your notes and explanation were very helpful and now there is no doubt that our current approach needs to be improved as you've described. There is a corresponding task created at our tracker, you can view its progress at http://community.polarion.org/polarion/ ... yout=clear
Best regards,

Elena Matokhina

Polarion Team

tomasn
Posts: 5
Joined: Tue Oct 10, 2006 10:35 am

Postby tomasn » Thu Jan 04, 2007 1:42 pm

It seems like this problem is back again. Can you please look into it as soon as possible since this functionality is very important to us. It worked in 1.1M9 but has stopped working since 1.1M9a and still fails in 1.1RC2.

When you do Team->Synchronize the right pane is empty for a file that has been copied and changed. After checkin you can view the history so it is copied it is just the Synchronize view that does not show it properly.

Alexander Gurov
Posts: 205
Joined: Fri Mar 17, 2006 11:33 am

Postby Alexander Gurov » Tue Jan 09, 2007 4:20 pm

Dear Tomas,

Thank you for reporting the problem. It is fixed in the Subversive 1.1.0.RC3 which will be available at the end of this week.
Best regards,
Alexander Gurov
Subversive Team

tomasn
Posts: 5
Joined: Tue Oct 10, 2006 10:35 am

Postby tomasn » Tue Jan 16, 2007 5:29 pm

Alexander Gurov wrote:Dear Tomas,

Thank you for reporting the problem. It is fixed in the Subversive 1.1.0.RC3 which will be available at the end of this week.


I tried 1.1.0.RC3 and now it works again. Thank you for the fix.

NimdaCinatas
Posts: 6
Joined: Fri Oct 13, 2006 1:08 pm
Location: Sauerland, Germany

Postby NimdaCinatas » Wed Apr 11, 2007 12:31 pm

Dear Tomas and Alexander,

I wonder if this function still works for you Tomas. We're using subversive 1.1.1 now (with Eclipse 3.2.2) and I remembered that I opened a call regarding this.

The call was closed because it was fixed regarding svn-over-http. But we're using svn without a webserver and for this the problem still (or again) exists. Subversive throws an error because the old Path can't be found (for sure!). Starting a svn diff call from CLI with the same URL works perfectly.

Is anybody working on this (all calls are closed/resolved)?

Many thanks in advance!

Best regards,
Marcel


Return to “Polarion Subversive - Eclipse Client for SVN”

Who is online

Users browsing this forum: No registered users and 5 guests