[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: <e.huelsmann_at_gmx.net>
Date: 2003-09-09 22:31:30 CEST


Yes, it does. Look at a directory named ~/.subversion/ there is
a config file that may specify a global-ignores list. If none is
specified, the list mentioned there is used.
On my system it contains '*.o'



> Merging a branch back to trunk:
> joey@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

COMPUTERBILD 15/03: Premium-e-mail-Dienste im Test
1. GMX TopMail - Platz 1 und Testsieger!
2. GMX ProMail - Platz 2 und Preis-Qualitätssieger!
3. Arcor - 4. web.de - 5. T-Online - 6. freenet.de - 7. daybyday - 8. e-Post
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:32:24 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.