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

merge weirdness item in WC not under revision control

From: Joey Hess <joey_at_kitenet.net>
Date: 2003-09-09 22:24:22 CEST

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.

Using subversion 0.26.0, still.

see shy jo

  • application/pgp-signature attachment: stored
Received on Tue Sep 9 22:22:45 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.