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

Re: what creates .mine, .rN, .rN+1 files?

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-08-01 23:20:14 CEST

"Bob DuCharme" <bob@snee.com> writes:
> I understand the general scenario of finding out that you have a conflict
> when trying to commit an out of date foo.txt file, then comparing foo.txt,
> foo.txt.mine, foo.txt.r7, and foo.txt.r8, fixing foo.txt, and using the
> resolved command.
>
> I can't figure out exactly which step creates the mine, r7, and r8 files,
> and when it does it. Sometimes it seems like the update command does it,
> but it doesn't always do it when there is a conflict. Can someone tell me
> exactly what triggers the creation of these extra files? (And the commit
> command after the resolved command removes them, right?)

Update should always create those when there is a conflict. But when
there is a non-conflicting merge of changes, then those files are not
created. I can't remember if 'resolved' or 'commit' removes them; I
would expect the former, but experimentation could say.

If you can describe precisely what you're seeing, we'll be better able
to help.

-Karl

-- 
Subversion support & consulting  <>  http://producingoss.com/consulting.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 1 23:19:16 2007

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