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

RE: Refactor->renamed files and updating.

From: Stephen Kestle <Stephen.Kestle_at_orionhealth.com>
Date: 2005-04-27 22:59:00 CEST

Probably another good reason to have unit AND integration tests.

CVS (and presumably SVN) always said that version control was not a
substitute for communication.

But we will all be happy when a rename and a move are recorded as such.

By default subclipse does not check in unversioned files, so you should
be able to notice before "too late".

Cheers

Stephen

> -----Original Message-----
> From: Timothy Cordner [mailto:ttcordner@yahoo.com]
> Sent: Thursday, 28 April 2005 6:16 a.m.
> To: users@subclipse.tigris.org
> Subject: Refactor->renamed files and updating.
>
> Not sure if this is implemented yet or if it is
> implemented and it's not working like I expected:
>
> Scenario:
>
> 1. Joe and Charlie check out head of a repository.
> 2. Joe begins working on foo.java
> 3. Charlie begins working on foo.java as well, and
> decides it is misnamed and doesn't do 'foo' it does
> 'bar'.. so he changes code in foo... then
> refactor->renames the class 'foo' to 'bar'
> 4. Now Charlie commits his 'version' of the project.
> foo.java is gone and bar.java is added.
> 5. In the meantime.. Joe has made MAJOR changes to
> his snapshot's 'foo.java' file.. now.. when he is
> ready to commit.. he properly does his 'update' to get
> everyone elses changes in order to merge/resolve
> conflicts etc..
>
> Here's where the issue is... Joe does his update..
> but instead of getting to merge his code changes to
> foo.java with Charlie's code changes to foo.java
> (which is now bar.java), Joe now see's his foo.java as
> unversioned... and hey.. there's now a new file
> bar.java, but nothing to indicate to Joe that bar.java
> used to be foo.java. and any other file that
> referenced the class foo has been refactored to
> reference bar.. so when he commits.. no one is going
> to be referencing his class or his changes.. and they
> will not be 'merged' into the new bar.java.
>
> Shouldn't subclipse let you know that the file you
> edited was moved? or at least throw some kinda of
> warning.. or error.. otherwize on a large team..
> something will more than likely go unnoticed until too
> late.
>
> -Tim
>
>
>
> __________________________________
> Do you Yahoo!?
> Yahoo! Small Business - Try our new resources site!
> http://smallbusiness.yahoo.com/resources/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Apr 28 06:59:00 2005

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