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

Re: incorrect result of merge

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-12-16 11:50:04 CET

Peter McNab wrote:
> While everyone is anticipating a new release shortly the following
> appeared on the TortoiseSVN dev list and hasn't yet made it over here
> yet. I thought it better to pass on earlier rather than later and
> sincerely hope it's not going to upset the originators
>
> Michael Colefax wrote:
>> Here is the description of the scenario (using Tortoise 1.2.3 build
>> 4719):
>>
>> 1. create a branch and switch to it (repository revision 3)
>> 2. create a folder, add a file in the folder, and commit to the branch
>> (rev 4)
>> 3. create another file, not in the folder, and commit to the branch
>> (rev
>> 5)
>> 4. move the file created in step(2) to the parent directory, and
>> commit to
>> the branch (rev 6)
>> 5. switch to the main trunk
>> 6. merge in the changes made on the branch in revision 4
>> 7. merge in the changes made on the branch in revision 6
>> 8. commit the merges to the main trunk
>>
>> Following these steps, checkout the main trunk
>> The file created in step(2) appears in 2 locations!
>
> Running update on the original trunk does not generate the
> duplicate, but a fresh checkout does.

I think this may be closely related to issue 1736. Slightly different
symptoms, but similar course of actions to create the WC inconsistency.

It's a very old issue (dating back to v0.37), not a new one at all.

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 Fri Dec 16 11:49:38 2005

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