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

naming of conficting files not documented

From: Lorenz <work_at_familie-lenhardt.de>
Date: 2004-11-04 12:19:48 CET

Hi all,

I'm merging to the difference of 2 tags to my wc.

I the case of a conflict I get 4 files in my wc named:
  <file>,
  <file>.merge-links.rXY,
  <file>.merge-rechts.rXY and
  <file>.working

This file name extentions are not documented

I identified <file> to be the merge result containing the confict
markers and <file>.working to be the original from my wc.

Am I right in assuming that left and right corresponds to the first
and second parameter of svn merge?

by the way: why is "left/right" translated but not "working"?
(I think left/right should not be translated either, but that's just
me 8-)

Lorenz (running svn / tsvn 1.1.1 on w2k)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 4 12:20:48 2004

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