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

Re: [Subclipse-users] svn:ignore merge conflict

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-09-27 17:07:58 CEST

<petra.gratzer@ubs.com> wrote on 09/27/2006 11:03:36 AM:

> I have created a completely new empty Java project. Afterwards i shared
> project with subversion. At the first commit window i only include the
> Folder to be commitet.
> Now the problem starts. I excluded one file from version control by
> the svn:ignore property. Now i called commit and get an error, that a
> is maybe out-of date.
> When i call update i get the message, that i'm already at the current
> revision. If i call commit again, then it works.
> When i add a second file to svn:ignore this "out-of-date" message does
> appear again.
> Does someone have any idea why this happens the first time i add a new
> project into an subversion repository?

This FAQ explains it.


As of Subclipse 1.1.6, if you use the Synchronize option we will show Out
of Date folders as incoming changes by default. So if you do something
like modify the svn:ignore property on an out of date folder, the folder
will show as a Conflict in the Synch view. Hopefully this will help make
it clearer that you need to do an update before you can commit.


To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Sep 27 17:08:22 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.