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

svn resolved doesn't remove older conflict-related artifact files

From: Jens Seidel <jensseidel_at_users.sourceforge.net>
Date: 2006-07-07 10:06:47 CEST


I merged a file twice and got both times a conflict which I didn't resolved
after the first operation. So I got:

$ svn status
? include.h.merge-links.r199
? include.h.merge-links.r200
? include.h.working
? include.h.merge-rechts.r200
? include.h.merge-rechts.r201
? include.h.2.working
C include.h

After resolving the conflict I still have three intermediate files:

$ svn resolved include.h
Resolved conflict of 'include.h'

$ svn status
? ThermSimul/KERN/include.h.merge-rechts.r200
? ThermSimul/KERN/include.h.merge-links.r199
? ThermSimul/KERN/include.h.working
M include.h

Is this behaviour correct/expected?

The Subversion book contains:

> Remove “conflicted” state on working copy files or directories. This routine
> does not semantically resolve conflict markers; it merely removes
> conflict-related artifact files

It doesn't say that *all* conflict-related artifact files will be removed, but
it also doesn't say the opposite.

Please CC: me.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 7 10:10:15 2006

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.