Joey Hess <joey@kitenet.net> writes:
> Merging a branch back to trunk:
>
> joey_at_dragon:~/src/mooix/mood>svn merge -r 1705:HEAD svn+ssh://svn.mooix.net/home/svn/mooix/branches/moox_embedding_rewrite_branch/mood
> svn: Can't find an entry
> svn: Can't merge changes into 'mood':it's not under revision control.
>
> This threw me for a while, until I realized that in the WC directory was a
> "mood" file (the binary produced during my last build), that was of
> course not under revision control. I deleted it and the merge proceeded
> as expected.
>
> Is there some reason why subverson cared that I had a ./mood in the WC,
> but did not care about mood.o, etc, that are also in the WC? Perhaps it
> got confused since "mood" is also the name of the branch, and of the
> directory I was doing the merge in.
'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.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 9 22:44:04 2003