Stephen McConnell <mcconnell_stephen@yahoo.com> wrote on 02/01/2005
02:36:06 PM:
> 1) We are having problems with commits where there is a conflict.
> For example, I have a file out on the repository called
> overview.html.
>
> Another developer can make changes to their local version; and if
> there were no conflicts, the commit works fine. The version out
> in the repo is v 281.
>
> However, if afterwards, I sync the repository, make some changes to
> my local copy (v 280) and then commit, it says there are conflicts.
> This is as it should be. Now, I merge the conflicts into my local
> version. I attempt to commit and I get this error.
In 0.9.25 the Synch view wasn't really ready to be used. You could edit
conflicts and save them, but we did not have the Mark as Merged option and
we did not hook up the Commit action yet.
This is all rectified in today's 0.9.26 release.
> org.tigris.subversion.javahl.ClientException: Transaction is out of
> date
> svn: Commit failed (details follow):
> svn: Out of date:
>
'/MEMBERzplusV1/branches/developers/smcconnell20050126/source/overview.html'
> in transaction '281-1'
>
> org.tigris.subversion.svnclientadapter.SVNClientException:
> org.tigris.subversion.javahl.ClientException: Transaction is out of
> date
> svn: Commit failed (details follow):
> svn: Out of date:
>
'/MEMBERzplusV1/branches/developers/smcconnell20050126/source/overview.html'
> in transaction '281-1'
This is because your WC still has revision 280. You need the Mark as
Merged option so that your WC can be told it is at revision 281.
> This is EXTREMELY problematic, because this is the WHOLE CONCEPT OF
> TEAM DEVELOPMENT through either CVS or Subversion!!!!!!! The ability
> to merge conflicts together and make the changes.
Don't shout, we are not morons.
> I have also tried this through Tortoise; and am not able to do the same
> thing. Am I missing a step? This is the way that I do the same
> process through the Eclipse CVS repository connection.
Tortoise also has nothing like the Synch view. If you had just stayed
away from it, you would not have had a problem. When you do Team ->
Update your changes will be auto-merged and if you have a merge conflict,
then Team -> Edit Conflicts lets you fix them. You then do Team -> Mark
Resolved to tell Subversion you have fixed the conflict. You then do Team
-> Commit. This is all identical to TortoiseSVN.
> 2) In the Team Synch perspective, although I have a "commit" popup menu
> item, I cannot commit from that perspective. I have to change to the
> JAVA perspective to commit... Which is extremely cludgey... I can
> "update" from this view, but I can't commit.
Again, commit action was not hooked up in 0.9.25. It was just a place
holder.
> 3) When I update or commit, the sync view still retains the elements
> that I have updated or commited. If I resync or refresh my java
> perspective the elements are still there. I have to EXIT ECLIPSE to
> get this to work. This is also extremely problematic when I try to
> convince the other developers to use Eclipse/Subclipse/Subversion
This is a lot better in 0.9.26, but there are still problems with adds and
deletes not refreshing correctly.
> We decided to adopt Eclipse/MyEclipse/Subclipse and Subversion as our
> development model. All the developers in the company are having the
> same exact problem.
>
> Are we missing a step in our copy/modify/merge/commit steps? Do we
> need to add some configuration to our subclipse installation (we used
> the
> "update" method for the subclilpse install)?
Well, for starters, why do you insist on using the Synchronize view?
Neither Subversion nor TortoiseSVN have any equivalent for it. All of the
normal Subversion options are available in Subclipse, use those. Even if
we get Synchronize working 100%, in my opinion, the other way is still
better. I guess the one exception would be if you really needed to see
what was going to come in on an update. I do not have that problem so I
just do Team->Update at the project level.
Let us know how 0.9.26 works for you. Also, if you use custom port
numbers in your URL's, be aware that there is a bug in that, and there is
a custom fix you can download. There were previous messages on list today
for this.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Wed Feb 2 06:48:36 2005