Re: merging problem when not trying to merge

Garret Wilson <garret@globalmentor.com> writes:

> Ben,
>
> Ben Collins-Sussman wrote:
> > Try checking out a fresh working copy.
>
> Thanks, will do at the next opportunity, but...
>
> ...don't we want to know why this happened, and how to prevent it from
> happening on a repository with 90 bajillion files that I'd rather not
> start over from a fresh checkout?

Surely. The next question here is: where is the bug?

I'm suspicious, because you used TortoiseSVN to do the initial commit
which failed and left your working copy all mucked up. I'm not
criticizing TortoiseSVN; but we need a reproduction recipe here that
uses the commandline client. Can you give us one?

> ... a commit shouldn't write to the modified files themselves,
> right?

Only if you commit a propchange that munges the working file, like
svn:eol-style or svn:keywords.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 28 22:32:46 2003