Re: 'Out of date' merging branch to trunk with replaced file

On 3/12/07, Chad Daelhousen <chad@herballure.com> wrote:
> Hi, I'm rather puzzled by this sequence of events.
>
> I'm doing day-to-day work in branches/dev, and trunk tracks what's
> currently running on the server.
>
> r964 is currently running on the server, at which point both trunk and
> dev were synchronized with each other. The old
> backend/core/src/Search.php was deleted in r986, and the rewritten
> version added with no history in r987. Current HEAD is r1039.

Which version of Subversion are you using? That's important, because
early versions had problems merging replacements...

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Mar 12 17:13:41 2007