[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: Michael Colefax <MichaelCo_at_resmed.com.au>
Date: 2005-12-22 01:17:57 CET

> > Michael wrote:
> > The issue for Tortoise is the difference in the reporting of the results
in
> > step(7). Why does Tortoise indicate the file was deleted, while
Subversion
> > indicate the deletion was skipped?
>
> Simon wrote:
> Hard to know what it should report. Evidently Subversion is broken here,
> but I suppose we should report the same as the CLI.

After some discussion in subversion, it appears as though Subversion (v1.2.3
r15833) is working correctly.

http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=110123

http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=110143

Simon wrote:
> I can reproduce this in r5039. Interestingly, running update on the
> original trunk does not generate the duplicate, only a fresh checkout.
> That's bad :-(

Yes, I see this too - but only when using Tortoise!

The Subversion behaviour was confirmed correct by Phillip Martin in the
discussion linked above. Have you been able to reproduce this with
Subversion alone?

In the second merge, Subversion reports "Skipped 'wc\folder\file1.cpp'",
but Tortoise reports that it deletes it. This is when the problem starts -
and the behaviour of Subversion and Tortoise deviates.

Note for this comparison I am using Subversion v1.2.3 r15833, and Tortoise
v1.2.5 build4719 (which says it contains Subversion v1.2.3)

Michael

Warning: Copyright ResMed. Where the contents of this email and/or attachment includes materials prepared by ResMed, the use of those
materials is subject exclusively to the conditions of engagement between ResMed and the intended recipient.
 
This communication is confidential and may contain legally privileged information.
By the use of email over the Internet or other communication systems, ResMed is not waiving either confidentiality of, or legal
privilege in,the content of the email and of any attachments.
If the recipient of this message is not the intended addressee, please call ResMed immediately on +61 2 9886 5000 Sydney, Australia.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sun Dec 25 03:47:18 2005

This is an archived mail posted to the TortoiseSVN Users mailing list.