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

Re: Getting started on the release -- one more thing though...

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2003-02-25 16:45:58 CET

Michael Price <mprice@atl.lmco.com> writes:
> I'm assuming that 5088 is the last revision to include.
>
> However, after getting started I ran into a potential buglet.
>
> If you svn switch to the release branch and attempt to merge -r
> 5007:5008 from trunk then you get conflicts. If you then use gnu diff on
> left and right and patch working then it proceeds just fine.

So 'svn merge' is declaring a conflict where no conflict exists?

> So I just skipped including that revision. Let me know if that's another
> bug I should hold up for or if I should continue.

The fact that 'svn merge' had trouble applying revision 5008 doesn't
mean there's a problem in 5008. (Or am I misunderstanding what you're
saying?)

The revision should go in, using whatever means needed to get it in
(merge, diff+patch, hand mods, whatever), I think. Whether we have a
bug in 'svn merge' is a separate question.

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 25 17:20:24 2003

This is an archived mail posted to the Subversion Dev mailing list.