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

Erik Huelsmann wrote:
> 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...

That was mentioned near the bottom of the mail; 1.3.2. I failed to say
it's on Gentoo, though.

To get stuff done, merging and committing r964:986, then doing the rest
of the merge in a second commit, worked fine. If there's a more elegant
way, though, I'd still like to know for future reference.

-- 
Chad Daelhousen
"Television shepherds with living room sheep/ And I pray"
   --Temple of the Dog, "Wooden Jesus"
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org