lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <>
Subject [Lucene-java Wiki] Update of "SvnMerge" by SteveRowe
Date Fri, 18 Mar 2011 20:06:23 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: Added an example of merging from trunk to branch_3x.


  svn propdel svn:mergeinfo  remove/mergeinfo/from/this/path
+ == Example merge from trunk to branch_3x ==
+  1. `svn merge` at the top level, noting tree
conflicts, e.g. from `modules/`
+  1. For each of the conflicts, `svn resolve --accept=working conflicted/path/here`
+  1. For each changed path/file, figure out the highest possible path (root is highest) in
common between `trunk` and `branch_3x`, change to that directory in `branch_3x`, then merge
from the corresponding trunk dir.
+  1. `svn stat` to discover which directories and files have accumulated `svn:mergeinfo`
properties below the top-level directories that get generated by merging below the top-level
dir - the second column from the left for each changed item will have an {{{ "M" }}} for property
+  1. For each of the dirs/files below the top-level dir (except `solr/` and `lucene/`, which
are allowed to accumulate `svn:mergeinfo`), `svn propdel svn:mergeinfo path/to/item/with/mergeinfo`
+  1. `svn stat` again to be sure nothing is left out or unintentionally included
+  1. Compile/test, if the build is affected by the changes
+  1. `svn commit`
  == References ==
   * From the Subversion book:

View raw message