Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36B289882 for ; Mon, 30 Jul 2012 16:37:30 +0000 (UTC) Received: (qmail 38229 invoked by uid 500); 30 Jul 2012 16:37:30 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 38173 invoked by uid 500); 30 Jul 2012 16:37:30 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 38164 invoked by uid 99); 30 Jul 2012 16:37:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jul 2012 16:37:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jul 2012 16:37:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A4D00238890B; Mon, 30 Jul 2012 16:36:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1367156 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py Date: Mon, 30 Jul 2012 16:36:43 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120730163643.A4D00238890B@eris.apache.org> Author: julianfoad Date: Mon Jul 30 16:36:43 2012 New Revision: 1367156 URL: http://svn.apache.org/viewvc?rev=1367156&view=rev Log: * subversion/tests/cmdline/merge_tests.py (dont_merge_revs_into_subtree_that_predate_it): Add a diagram. Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1367156&r1=1367155&r2=1367156&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Jul 30 16:36:43 2012 @@ -11061,6 +11061,18 @@ def reverse_merge_away_all_mergeinfo(sbo def dont_merge_revs_into_subtree_that_predate_it(sbox): "dont merge revs into a subtree that predate it" + # +-> merge -c7 A/D/H/nu@7 H_COPY/nu + # | +-> merge -c2 A/D/H H_COPY + # | | +-> merge A/D/H H_COPY + # | | | + # A/D/H A---------------------- + # +-psi +-M-------------M------ + # +-nu A-D C---M-D + # H_COPY C---------G-G + # +-psi +---------+-. + # +-nu +-------G---. + # 1 2 3 4 5 6 7 8 9 w w w + # Create our good 'ole greek tree. sbox.build() wc_dir = sbox.wc_dir