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

Re: merge weirdness item in WC not under revision control

From: Joey Hess <joey_at_kitenet.net>
Date: 2003-09-10 18:34:29 CEST

Ben Collins-Sussman wrote:
> 'svn merge' means, "please apply this patch to my working copy".
> The patch you specified involves changing a file called 'mood'. But
> your working copy has no such file -- at least, not under version
> control. So the patch isn't going to apply cleanly, no matter what
> you do. If you had been running svn 0.29, it probably would have just
> said
> skipping file 'mood'
> ...and continued on. But you're using an older version, so it was a
> bit more cranky.

Makes no sense to me, mood/mood is not and has never been in my
repository. It's a svn:ignored binary file.

see shy jo

  • application/pgp-signature attachment: stored
Received on Wed Sep 10 18:33:23 2003

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

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