From users-return-16340-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Tue Oct 2 11:44:34 2012 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 2396FDA5C for ; Tue, 2 Oct 2012 11:44:34 +0000 (UTC) Received: (qmail 95164 invoked by uid 500); 2 Oct 2012 11:44:33 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 93403 invoked by uid 500); 2 Oct 2012 11:44:29 -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 93373 invoked by uid 99); 2 Oct 2012 11:44:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2012 11:44:28 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [192.109.42.8] (HELO einhorn.in-berlin.de) (192.109.42.8) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2012 11:44:19 +0000 X-Envelope-From: stsp@stsp.name Received: from ted.stsp.name (ted.stsp.name [217.197.84.34]) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id q92BhsTN012093 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 2 Oct 2012 13:43:54 +0200 Received: from ted.stsp.name (stsp@localhost [127.0.0.1]) by ted.stsp.name (8.14.5/8.14.3) with ESMTP id q92Bhsgp007923; Tue, 2 Oct 2012 13:43:54 +0200 (CEST) Received: (from stsp@localhost) by ted.stsp.name (8.14.5/8.14.3/Submit) id q92Bhsji027233; Tue, 2 Oct 2012 13:43:54 +0200 (CEST) Date: Tue, 2 Oct 2012 13:43:54 +0200 From: Stefan Sperling To: users@subversion.apache.org Cc: chroyer Subject: Re: ignore ancestry and record only Message-ID: <20121002114354.GE16802@ted.stsp.name> Mail-Followup-To: users@subversion.apache.org, chroyer References: <1820689790.2415865.1349118421520.JavaMail.root@sz0039a.emeryville.ca.mail.comcast.net> <506A9937.8030103@dominolaser.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <506A9937.8030103@dominolaser.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 X-Virus-Checked: Checked by ClamAV on apache.org On Tue, Oct 02, 2012 at 09:35:19AM +0200, Ulrich Eckhardt wrote: > Am 01.10.2012 21:07, schrieb chroyer: > >I was wondering if the following scenario makes sense, or if this is > >asking for problems. > > > > * I am regularly merging differences between 2 trees (I won't go in > >too much details here...those tree are not really under my control; I > >put those them in the tags area, and I want to merge the changes between > >2 consecutive such snapshots. In my case, I can not just use a branch > >and update it with the latest version - the tree gets modifications > >before being tagged). > > It's unfortunate that you don't want to go into details here. Indeed. In addition to explaining your intentions and problem, which you've done very well, please show us the commands you're using to implement your approach. Having to guess what you're actually doing makes giving advice over email harder. > > * to merge the differences between 2 snapshots, I am using > >--ignore-ancestry (otherwise I see a lot of files being "replaced"). Please show us all svn commands you're running, starting from "putting snapshots into the tags area" up to "I see a lot files being replaced". It may well be that a simple tweak to your command sequence could fix problems with replacements and the like. It's usually best to provide a list of commands (a working shell script is even better) that starts off with an empty repository and ends with the command where you're running into a problem. This way, others can try to reproduce the problem and figure out a solution.