Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B9A659C0E for ; Wed, 5 Oct 2011 13:39:02 +0000 (UTC) Received: (qmail 65312 invoked by uid 500); 5 Oct 2011 13:39:01 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 65299 invoked by uid 500); 5 Oct 2011 13:39:01 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 65292 invoked by uid 99); 5 Oct 2011 13:39:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2011 13:39:01 +0000 X-ASF-Spam-Status: No, hits=-1.6 required=5.0 tests=RCVD_IN_DNSWL_MED,SPF_NEUTRAL,TO_NO_BRKTS_PCNT X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [207.126.144.141] (HELO eu1sys200aog116.obsmtp.com) (207.126.144.141) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2011 13:38:54 +0000 Received: from UKHC-SMTP.dps.local ([64.212.99.80]) by eu1sys200aob116.postini.com ([207.126.147.11]) with SMTP; Wed, 05 Oct 2011 13:38:33 UTC Received: from DESA-Exchange.emea.dps.local (desa-exchange.emea.dps.local [192.168.55.10]) by UKHC-SMTP.dps.local (Postfix) with ESMTP id 8DBCB12694F for ; Wed, 5 Oct 2011 14:38:28 +0100 (BST) Received: from [192.168.55.70] ([192.168.55.70]) by DESA-Exchange.emea.dps.local with Microsoft SMTPSVC(6.0.3790.4675); Wed, 5 Oct 2011 15:38:28 +0200 Message-ID: <4E8C5DD3.4020909@dominolaser.com> Date: Wed, 05 Oct 2011 15:38:27 +0200 From: Ulrich Eckhardt Reply-To: users@subversion.apache.org Organization: Domino Laser GmbH User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: users@subversion.apache.org Subject: Re: how to compare an exported file (or set of files) against the repository? References: <1EF123869BB2CC4EAC0A1AA45CFFC2FA04002F5D03@DEFRWPMB001.ad.fdc.mazdaeur.com> In-Reply-To: <1EF123869BB2CC4EAC0A1AA45CFFC2FA04002F5D03@DEFRWPMB001.ad.fdc.mazdaeur.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 05 Oct 2011 13:38:28.0480 (UTC) FILETIME=[1090E000:01CC8364] Am 05.10.2011 14:49, schrieb Mertens, Bram: > I have been unable to find an answer to this in the FAQ or the > mailing list archives. I found one question that appears to be > similar to what I'm trying to achieve but it did not contain a > reply that solves my problem. I haven't found the need for that yet, even though I'm prepared (see below) for the situation. > I've got a set of files that were exported from a repository some > time ago. The files have been moved around and some have been > edited since. > > I would like to find out: > a) what revision these files are from and There are so-called keywords, which SVN can be made to replace in text files. You can for example tell it to fill in the URL and revision a file is checked out from. This can be used to attach some metadata to an exported source tree. Of course that doesn't help you know, unless someone already prepared for this case. Note that the revision of a file doesn't change if you change a different file, so it can't give you _The_ revision of the source tree. OTOH, there is no guarantee that you don't have an export from a mixed-revision working copy. > b) changes have been made to it that may not be in the repository? Find out where this was exported from, and check out that revision. Copy the export on top of it and compare, or use a recursive tree comparison utility. > Is this possible without looping through all the revisions and > calculating checksums? The problem with appraoch besides the time it > would take is that it would obviously not catch files that are not > 100% identical to the files in that revision. If the source tree contains files from several different revisions, that will be the only (hard) way to go. However, I guess you can expect that the export was made from one revision. If you know the history of the according project a bit, you might be able to find the approximate revision it was checked out and from there search for the exact revision. Another hint might be hidden in modification timestamps. BTW: The most efficient way is to check out an approximate revision and then use "svn up -r ..." to move to the next revision quickly. In particular you shouldn't use export instead of an incremental update. Good luck! Uli ************************************************************************************** Domino 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.dominolaser.com ************************************************************************************** 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. Domino Laser GmbH ist f�r diese Folgen nicht verantwortlich. **************************************************************************************