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

Re: naming of conficting files not documented

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-11-04 16:15:36 CET

On Nov 4, 2004, at 5:19 AM, Lorenz wrote:

> 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

What do you mean they're not documented? It's in the book right here:

    
http://svnbook.red-bean.com/svnbook-1.0/ch03s05.html#svn-ch-3-sect-4.4

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

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