lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Lucene-java Wiki] Update of "SvnMerge" by SteveRowe
Date Wed, 12 Jan 2011 06:14:17 GMT
Dear Wiki user,

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

The "SvnMerge" page has been changed by SteveRowe.
The comment on this change is: Link cleanup; reworded moved path premise..
http://wiki.apache.org/lucene-java/SvnMerge?action=diff&rev1=4&rev2=5

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

  
  == Handling Moved Paths ==
  
- The Subversion book [[http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.advanced.finalword|says]]:
+ 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-book.html#svn.branchmerge.commonpatterns|the
section called "Common Branching Patterns"]]), perform merges only on the root of the branch,
not on subdirectories. ||
+  || For long-lived release branches (as described in [[http://svnbook.red-bean.com/en/1.5/svn.branchmerge.commonpatterns.html|the
section called "Common Branching Patterns"]]), perform merges only on the root of the branch,
not on subdirectories. ||
  
- 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`, it is necessary to
merge below the top level directory; follow the instructions under [[#Partial Commit|Partial
Commit]].
+ 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 necessary; follow the instructions under [[#Partial Commit|Partial
Commit]] and [[#Merge 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 information (see [[#svn:mergeinfo|the svn:mergeinfo
section]] for an explanation of why this is a problem).
  

Mime
View raw message