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

Re: [Subclipse-users] 1.1.4: Merge conflict during commit in freshly shared project

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-07-28 14:34:21 CEST

news <news@sea.gmane.org> wrote on 07/28/2006 07:51:26 AM:

> Mark Phippard wrote:
> > Subversion does not allow you to rename/delete files or set properties
on
> > a folder unless that folder is at its HEAD revision.
>
> Yes but, I shared (added & committed) the folder including some of its
> files for the first time ever. So it definitely IS at its HEAD revision
> after that operation. But next commit failed because it wasn't? So the
> WC somehow thinks that it's not and I think that's the problem (bug?)
here.

No, sharing a project creates a folder for the project in the repository
and then checks it out. That puts the folder at r1. Now you commit files
in r2. The folder is still at r1.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Jul 28 14:34:34 2006

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