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 A7D2FFDF2 for ; Tue, 13 Aug 2013 14:15:58 +0000 (UTC) Received: (qmail 24703 invoked by uid 500); 13 Aug 2013 14:15:56 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 24691 invoked by uid 500); 13 Aug 2013 14:15:56 -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 24671 invoked by uid 99); 13 Aug 2013 14:15:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Aug 2013 14:15:56 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=SPF_PASS,T_FILL_THIS_FORM_SHORT X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [83.218.36.120] (HELO mail.am-soft.de) (83.218.36.120) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Aug 2013 14:15:44 +0000 Envelope-To: users@subversion.apache.org Received: from localhost (dslb-094-223-123-217.pools.arcor-ip.net [94.223.123.217]) by mail.am-soft.de (Postfix) with ESMTP id 61F457E2 for ; Tue, 13 Aug 2013 16:15:20 +0200 (CEST) Date: Tue, 13 Aug 2013 16:15:26 +0200 From: =?iso-8859-1?Q?Thorsten_Sch=F6ning?= Organization: AM-SoFT IT-Systeme X-Priority: 3 (Normal) Message-ID: <1508686644.20130813161526@am-soft.de> To: users@subversion.apache.org Subject: Re: Strange behavior In-Reply-To: <910250F21FAA2A4E8F72DD21EA78076609060768@VMJudi.corp.rotair.com> References: <910250F21FAA2A4E8F72DD21EA7807660905D39A@VMJudi.corp.rotair.com> <293BE2C1-563D-4167-BA09-51619A34F794@ryandesign.com> <910250F21FAA2A4E8F72DD21EA7807660905D3D7@VMJudi.corp.rotair.com> <8FF220C7-1456-41B7-8FE9-36EDBE626423@ryandesign.com> <910250F21FAA2A4E8F72DD21EA7807660905D6F9@VMJudi.corp.rotair.com> <5209053F.8070305@gmx.us> <910250F21FAA2A4E8F72DD21EA7807660905D76A@VMJudi.corp.rotair.com> <205554392.20130812224306@am-soft.de> <910250F21FAA2A4E8F72DD21EA78076609060768@VMJudi.corp.rotair.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org Guten Tag John Maher, am Dienstag, 13. August 2013 um 15:39 schrieben Sie: > Follow the book on how it instructs to import a project then > it becomes impossible to merge and branch. Branching is always possible and always equally cheap regardless of what you did before, because it breaks down to a cheap copy operation with preserving history. The only thing which may cost time is updating/checking the new branch out. If you have merge problems because of your tests or whatever one solution may be just recording merge info. This way you can move and copy and delete things in any way you like and make subversion think that those changes are already applied to a selected directory without really applying them, meaning you won't get any merge conflicts now or later from the revisions you recorded as already merged. This may prevent re-creating your repo and losing history. http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branch= merge.advanced.blockchanges Mit freundlichen Gr=FC=DFen, Thorsten Sch=F6ning --=20 Thorsten Sch=F6ning E-Mail:Thorsten.Schoening@AM-SoFT.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...........05151- 9468- 55 Fax...............05151- 9468- 88 Mobil..............0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Gesch=E4ftsf=FChrer: Andreas Muchow