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

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?)

thanks,

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 1 13:34:59 2007