> From: sussman@collab.net [mailto:sussman@collab.net]
> Sent: Tuesday, February 25, 2003 7:30 PM
> 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?
Sure. Doing that right now. What's fun is that it doesn't reproduce
with diff3-test:
$ ~/src/svn/subversion/tests/libsvn_delta/diff3-test build_neon.bat.release \
build_neon.bat.5007 \
build_neon.bat.5008 \
>merged
$ grep '<<<' merged
[no output]
So this is something that goes wrong in svn_wc_merge apparently...
I'll investigate some more.
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 25 18:13:16 2003