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

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

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2007-03-12 17:45:56 CET

On 3/12/07, Chad Daelhousen <chad@herballure.com> wrote:
> 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.

Yes, there is: use 1.4.x. This is a known defect of all versions <=
1.3.x. In 1.4.x the working copy format and library got fixed to be
able to represent replacements-with-history correctly.



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:46:24 2007

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.