Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
Reply-To: java-dev@lucene.apache.org
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
From: Apache Wiki <wikidiffs@apache.org>
To: Apache Wiki <wikidiffs@apache.org>
Date: Fri, 28 Jan 2011 15:38:49 -0000
Message-ID: <20110128153849.31376.23089@eosnew.apache.org>
Subject: 
 =?utf-8?q?=5BLucene-java_Wiki=5D_Update_of_=22SvnMerge=22_by_SteveRowe?=

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Lucene-java Wiki" f=
or change notification.

The "SvnMerge" page has been changed by SteveRowe.
The comment on this change is: fix link to partial merge section (was missp=
elled "partial commit").
http://wiki.apache.org/lucene-java/SvnMerge?action=3Ddiff&rev1=3D5&rev2=3D6

--------------------------------------------------

  The Subversion book [[http://svnbook.red-bean.com/en/1.5/svn.branchmerge.=
advanced.html#svn.branchmerge.advanced.finalword|says]]:
   || For long-lived release branches (as described in [[http://svnbook.red=
-bean.com/en/1.5/svn.branchmerge.commonpatterns.html|the section called "Co=
mmon Branching Patterns"]]), perform merges only on the root of the branch,=
 not on subdirectories. ||
  =

- However, when one or more of the changed paths in the `trunk/` commit has=
 been moved from its location under `branch_3x/`, e.g. `modules/analysis/*`=
 and `modules/benchmark`, merging below the top level directory is necessar=
y; follow the instructions under [[#Partial Commit|Partial Commit]] and [[#=
Merge Conflicts|Merge Conflicts]].
+ However, when one or more of the changed paths in the `trunk/` commit has=
 been moved from its location under `branch_3x/`, e.g. `modules/analysis/*`=
 and `modules/benchmark`, merging below the top level directory is necessar=
y; follow the instructions under [[#Partial Merge|Partial Merge]] and [[#Me=
rge Conflicts|Merge Conflicts]].
  =

  Without taking further action, though, each merged moved path will carry =
its own private `svn:mergeinfo` copy of all its ancestors' merge informatio=
n (see [[#svn:mergeinfo|the svn:mergeinfo section]] for an explanation of w=
hy this is a problem).
 =20