From owner-freebsd-questions@FreeBSD.ORG Fri Jan 25 00:19:53 2013 Return-Path: Delivered-To: questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 10D499DB for ; Fri, 25 Jan 2013 00:19:53 +0000 (UTC) (envelope-from glarkin@FreeBSD.org) Received: from mail1.sourcehosting.net (mail1.sourcehosting.net [74.205.51.45]) by mx1.freebsd.org (Postfix) with ESMTP id D95C2FD3 for ; Fri, 25 Jan 2013 00:19:52 +0000 (UTC) Received: from 24-181-237-39.dhcp.oxfr.ma.charter.com ([24.181.237.39] helo=Gregory-Larkins-iMac.local) by mail1.sourcehosting.net with esmtp (Exim 4.73 (FreeBSD)) (envelope-from ) id 1TyX1A-000N9x-5D; Thu, 24 Jan 2013 19:19:48 -0500 Received: from Gregory-Larkins-iMac.local (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by Gregory-Larkins-iMac.local (Postfix) with ESMTPS id BD0E419A9E44; Thu, 24 Jan 2013 19:19:39 -0500 (EST) Message-ID: <5101CF9A.90903@FreeBSD.org> Date: Thu, 24 Jan 2013 19:19:38 -0500 From: Greg Larkin Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Xyne References: <20130123012915.GA16404@external.screwed.box> <51004C02.9040107@FreeBSD.org> <20130124215452.3fba0d68@archlinux.ca> In-Reply-To: <20130124215452.3fba0d68@archlinux.ca> X-Enigmail-Version: 1.5 X-SA-Exim-Connect-IP: 24.181.237.39 X-SA-Exim-Mail-From: glarkin@FreeBSD.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail1.sourcehosting.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=AWL,BAYES_00, RCVD_IN_SORBS_DUL,RDNS_DYNAMIC,TVD_RCVD_IP autolearn=no version=3.3.1 Subject: Re: 'svn-export' incrementing? Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SA-Exim-Version: 4.2 X-SA-Exim-Scanned: Yes (on mail1.sourcehosting.net) Cc: Peter Vereshagin , questions@freebsd.org X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: glarkin@FreeBSD.org List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2013 00:19:53 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 1/24/13 4:54 PM, Xyne wrote: > Greg Larkin wrote: > >> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 >> >> On 1/22/13 8:29 PM, Peter Vereshagin wrote: >>> Hello. >>> >>> I use the 'svn-export this way and expect it will try to >>> update the 'work-tree' next time I run it: >>> >>> $ python3 svn-export-2013.1/svn-export >>> http://svn.gna.org/svn/nasmail/trunk nasmail Exporting new >>> repository. Exported revision 1546 [portato@screwed /tmp]$ ls >>> -a nasmail . decode plugin_pack >>> tests utilities .. nasmail plugins >>> translations [portato@screwed /tmp]$ python3 >>> svn-export-2013.1/svn-export >>> http://svn.gna.org/svn/nasmail/trunk nasmail Exporting new >>> repository. svn: E155000: Destination directory exists; please >>> remove the directory or use --force to overwrite svn: E155000: >>> 'nasmail' already exists error: Command '['svn', 'export', >>> '-r', 'HEAD', 'http://svn.gna.org/svn/nasmail/trunk', >>> 'nasmail']' returned non-zero exit status 1 >>> >>> I believe there is something wrong in the way I use the >>> 'svn-export'. Otherwise it's a no problem for me to patch for >>> '--force'. >>> >>> How can I update the already created 'work tree' with 'svn >>> update'? I think the correct answer is a good idea for >>> 'Synopsis' docs section. >>> >> >> Hi Peter, >> >> In order for svn-export to work in incremental mode, you need to >> use the --revision-file argument like so: >> >> python3 svn-export-2013.1/svn-export -r rev.dat >> http://svn.gna.org/svn/nasmail/trunk nasmail >> >> Then at some point in the future, run the same command. >> svn-export will read rev.dat, compare the version in there with >> the current HEAD revision. If they are different, the script >> creates a diff and applies it to the local directory. >> >> Hope that helps, Greg > > Hi, > > The explanation is correct but the command example is not. It > should be > > svn-export --revision-file rev.dat ... > > The reason for this is that svn-export does not include any SVN > data with the exported files so it has no way to determine what the > currently exported revision is from the directory alone. You could > manually run > > svn-export -r :HEAD ..." > > but it would be tedious. The "--revision-file" option automates > this by storing the local export's revision number in a file. It is > used to determine which revision to diff against. Essentially it is > the same as running > > svn-export -r $(cat rev.dat):... > > I hope this clears things up. > > Regards, Xyne > Hi Xyne, Thanks for catching that. I had intended to write "--revision-file", but PEBKAC took over! Cheers, Greg - -- Greg Larkin http://www.FreeBSD.org/ - The Power To Serve http://www.sourcehosting.net/ - Ready. Set. Code. http://twitter.com/cpucycle/ - Follow you, follow me -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlEBz5oACgkQ0sRouByUApBHUACeP/a83cmkE2EUn2rRL1b1MfaR 8sYAn3ycyyi2wfT2fFEp2KYkMR4V8OCu =SY/z -----END PGP SIGNATURE-----