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

Re: [Fwd: Re: incorrect result of merge]

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-12-20 14:37:39 CET

kfogel@collab.net wrote:
> Has anyone reproduced this with stock Subversion? There's nothing
> Tortoise-specific about the recipe. However, frustratingly the
> transcript is not a true transcript, but rather an approximation of a
> reproduction recipe, and at some steps I can think of multiple
> different interpretations. A true script would be nice (hint, hint
> :-) ).

Michael Colefax has just submitted a recipe. If I could add to his
comments, after step ##8, updating trunk does not show the 2 file
instances. So update to HEAD and fresh checkout at HEAD give different
results.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Dec 20 14:37:27 2005

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