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

Explanation on the conflict and "svn resolve" functionnality

From: Alexis Boutillier <alexis.boutillier_at_arteris.net>
Date: 2004-04-06 12:19:54 CEST

I would like to understand how do the conflict and revert functionnality

I had a conflict on a file and see that it creates two files with the
original one to mark the conflict.
but the conflict flag only exist if there is those tow other files so if
you delete the two other files manually, the status of the file change
 from in Conflict (C) to Modify (M) without doing "svn resolve".

I thinked that the conflict flag was in the svn entries to indicate that
the file is in conflict and that you need to run "svn resolve" to resolve
effectively the conflict.

I thinked it is dangerous to allow the resolution of a conflict by only
deleting two files.

What do you think of that ?

Boutillier Alexis
Methodology engineer
Arteris SA
The Network-on-Chip Company (TM)
6 parc Ariane Immeuble Mercure
78284 Guyancourt Cedex
Office: (+33) 1 61 37 38 71
Fac:    (+33) 1 61 37 38 41
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 6 12:21:30 2004

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

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