On Mon, 2004-05-10 at 12:10, Jan Hendrik wrote:
> Well, I had this strange conflict markers today again:
>
> Had deleted a paragraph in my working copy. Someone else did a
> change two paragraphs further and committed. On update I got the
> conflict with the <<<<.mine/==== being empty, and the
> ====/>>>>.rxxx part containing three paragraphs: the one I had
> deleted, the next unchanged paragraph, and finally the third
> changed on the repository.
>
> Should think that SVN is intelligent enough to understand that one
> change happened *before* a given paragraph and the other *after*.
> Also note that in the original case posted there was no delete nor
> any other modification. So there should not have been any conflict
Can you attach the 3 fulltext files to an email, and then also show us
the merged result with conflict markers? Be sure to cc: sander striker,
because it's his libsvn_diff library which is doing the 3-way merge and
producing conflict markers. Maybe he can comment on the result.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 10 19:15:46 2004