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

[Subclipse-users] properties and dir_conflicts

From: giovanni pagliarulo <giopaia_at_yahoo.co.uk>
Date: Mon, 23 Jun 2008 10:30:48 +0000 (GMT)

Hello to everyone

After going through a bunch of branch-tag-branch-tag iterations
I finally decided to merge my work in the trunk of my project
and I'm getting only 1 conflict on the topmost directory...
a file called dir_conflict.prej has been generated
containing the following:
Trying to delete property 'subclipse:tags' but value has been modified
from '27,0.1.1,/branches/0.1.1,branch
28,0.1.2,/branches/0.1.2,branch
40,0.1.3,/branches/0.1.3,branch
50,0.1.4,/branches/0.1.4,branch
59,0.1.5,/branches/0.1.5,branch
80,0.1.6,/branches/0.1.6,branch
27,0.1.1,/tags/0.1.1,tag
39,tag 0.1.2 - pre cleaning,/tags/0.1.2,tag
49,tag 0.1.3 - ok_main_menu,/tags/0.1.3,tag
92,0.1.6 - tag for first merge in trunk,/tags/0.1.6,tag
95,0.1.7 - towards first final,/branches/0.1.7,branch'

to '27,0.1.1,/branches/0.1.1,branch
28,0.1.2,/branches/0.1.2,branch
40,0.1.3,/branches/0.1.3,branch
50,0.1.4,/branches/0.1.4,branch
59,0.1.5,/branches/0.1.5,branch
80,0.1.6,/branches/0.1.6,branch
95,0.1.7 - towards first final,/branches/0.1.7,branch
27,0.1.1,/tags/0.1.1,tag
39,tag 0.1.2 - pre cleaning,/tags/0.1.2,tag
49,tag 0.1.3 - ok_main_menu,/tags/0.1.3,tag
92,0.1.6 - tag for first merge in trunk,/tags/0.1.6,tag
125,0.1.7,/tags/0.1.7,tag'.

How am I supposed to resolve this type of conflict?

I'm a subversion/subclipse newbie so forgive me
if my question doesn't seem too smart, but I've
searched about it and all I can found are
references to subclipse usage scenarios/tutorials
that seems to be different from the last version.

Thanks in advance
Gio

      __________________________________________________________
Sent from Yahoo! Mail.
A Smarter Email http://uk.docs.yahoo.com/nowyoucan.html

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-06-23 12:31:00 CEST

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