Re: Strange deletions

On Tuesday 07 July 2009, Chuck Holzwarth wrote:
> We are running subversion 1.5.4 and tortoise 1.6.1. We have noticed the
> following behavior:
>
> The following items were removed from SharedBase through a merge from the
> trunk at revision 6312: Core/Data/IBaseData.cs
> Core/Notification/Entity/LoggerEntityCollection.cs
> Core/Orchestration/Diagnostics/IOutputListenerManager.cs
> Core/Orchestration/Diagnostics/Logging/ILogBuffer.cs
> Yet, somehow, they still exist in trunk. How can a merge from trunk cause
> their deletion in SharedBase when they are not deleted in trunk and were
> never re-added to trunk.

What revision was merged there? What happened in that revision? Were manual
changes applied in addition to the merged revision? Also, where did you get
that output from? Are you looking at local changes? Maybe the log? Who's log?
Overall, the info is too little to understand what you were doing and what
you were seeing.

> Is there a way to use the merge history or other info to determine if this
> was a manual action or the result of the merge?

You can always look at the log, but it can impossible to tell where some
change came from if someone checked in a mixture between changes from a merge
and manual changes. What you can try is to recreate the scenario, check out
the branch from the version before and then apply the the merges from trunk.
If that results in deleted files, it was the merge. If not, it was manually
modified.

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
Sator Laser GmbH
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************