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

Re: Question regarding merging branches

From: Dylan Cuthbert <dylan_at_q-games.com>
Date: 2002-09-10 03:43:20 CEST

"Ben Collins-Sussman" <sussman@collab.net> wrote in message
> > 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.
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
Received on Tue Sep 10 04:00:55 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.