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

Subversion merge-conflict file naming: ".working"?

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-13 06:49:25 CET

Ok, so I've conquered my merge problems (many thanks for Ryan, Lieven, and
Blair for helping me out).

However, I noticed that the merge-conflict-generated files for my 1.3.0 svn
client talking to a 1.2.3 svn server are named differently then the file
names documented here:

http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4

My files look like this (I obfuscate the paths that I may not want to
publicize yet...until my project goes open source anyway):

mengland@localhost 11:35pm [~...internal/common] 1301> svn merge -r
1365:1581 svn+ssh://****/svnrepos/****/ClientAgent.cpp ****/ClientAgent.cpp
C ****/ClientAgent.cpp
mengland@localhost 11:36pm [~...internal/common] 1302> svn status
? ****/ClientAgent.cpp.merge-left.r1365
? ****/ClientAgent.cpp.merge-right.r1581
? ****/ClientAgent.cpp.working
C ****/ClientAgent.cpp
mengland@localhost 11:36pm [~...internal/common] 1303>

I see the following text at
<http://subversion.tigris.org/svn_1.3_releasenotes.html>:

"Merge conflict markers are now in the encoding of the user's locale. (Not
exactly a command line output change, but near enough)."

Does this account for the above stuff?

Are these merge-conflict-file names meant to be more-compatible with
3rd-party tools, by any chance? Or some other reason?

My apologies if this is a faq.

-Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 13 06:52:20 2006

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