Re: merge weirdness item in WC not under revision control

Ben Collins-Sussman wrote:
> Joey Hess <joey@kitenet.net> writes:
>
> > Makes no sense to me, mood/mood is not and has never been in my
> > repository. It's a svn:ignored binary file.
>
> Well, you're comparing two URLs... what does 'svn diff' say when you
> compare the same two urls?

A lot of things, but certianly nothing about an ignored file named mood
that is not in the repository.

joey_at_dragon:~/tmp/mood.bak>svn diff -r1705:1746 svn+ssh://svn.mooix.net/home/svn/mooix/branches/moox_embedding_rewrite_branch/mood | diffstat
 Makefile | 2 -
 mood.c | 28 ++++++++++++++++------
 mood.h | 22 ++++++++++++++---
 noembed.c | 26 ++++++++++++++++++++
 perl.c | 11 ++++----
 proxy.c | 77 ++++++++++++++++++++------------------------------------------
 python.c | 37 ++++++++++++++++-------------
 ruby.c | 32 ++++++++++++++++---------
 8 files changed, 138 insertions(+), 97 deletions(-)

-- 
see shy jo