[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: Michael Colefax <MichaelCo_at_resmed.com.au>
Date: 2005-12-21 05:58:00 CET

> > But the log for the main trunk doesnt show this -
> > although the output during the commit in step(8) did!
>
> That looks like a misunderstanding on your part.

Yes, I was expecting that every file on the main trunk would show up
explicitly as "added" somewhere in the main trunk history.

Following your explanation, I agree that it is not certain that Subversion
should remove the file from the folder as I expected. Thanks for your
analysis.

Note however Simons observation is still of concern - ie after commiting the
merge, the working copy does not contain the duplicate file, even after
doing an update. However a fresh check-out does contain it.

Thanks,
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: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 25 06:00:42 2005

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