Re: Why does merge skip files?!?

>>>>> "Gre7g" == Gre7g Luterman <gre7g@kyoht.com> writes:

    Gre7g> So I guess if anyone encounters this problem, try reloading
    Gre7g> your tree from scratch. It seems to clean SOMETHING up
    Gre7g> that svn update doesn't.

I've formed a superstition: whenever I'm about to do a merge, I first
ensure that my working copy is up to date (i.e., I've checked in every
important change), and then I delete every file that isn't under
revision control, like this:

  svn status --no-ignore . | egrep '^(\?|I)' | cut -c8- | xargs rm -rfv

Paranoid, perhaps, but I suspect this avoids just those sorts of
problems.

If I'm right, the real culprit is probably poor error reporting from
Subversion: there's a perfectly good reason why it cannot merge
(probably because there's already a non-versioned file named "foo",
but it wants to Add a file with the same name), but rather than
clearly explain that, it's merely skipping the file and letting us
wonder why.

-- 
... there are any number of partisan Democrats lurking in
engineering departments and liberal moles in software-writing
offices.
        -- Molly Ivins
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org