[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-02-25 19:29:36 CET

Karl Fogel <kfogel@newton.ch.collab.net> writes:

> 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?

Yeah, I just reproduced this. r5008 changes the line endings of a
single file; when you merge 5007:5008 into the branch working copy, it
declares the file Conflicted. This may simply be an edge-case that
Sander's difflib can't handle yet. Not a huge deal.

Sander, want to investigate?

---------------------------------------------------------------------
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:33:08 2003

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