Re: Question regarding merging branches

"Ben Collins-Sussman" <sussman@collab.net> wrote in message
news:86hegz4bnr.fsf@kepler.ch.collab.net...
> > However, I have a RIDICULOUS amount of files in the directory now:
>
> A conflict should create a single ".working" file and two ".r*"
> files. All of the *.tmp files shouldn't be there; it looks like the
> working copy library got interrupted somehow, repeatedly, and left all
> the .tmp garbage behind. Are you sure this was from a *single* merge
> call?

yes, I did a "ls" beforehand and the files didn't exist. It looks like it
is more of a problem (more files) with the cygwin based svn than the native
windows version, but the problem does exist in both.

--
---------------------------------
Q-Games, Dylan Cuthbert.
http://www.q-games.com
P2P internet radio - http://www.peercast.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org