You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@couchdb.apache.org by Apache Wiki <wi...@apache.org> on 2008/08/31 10:30:12 UTC

[Couchdb Wiki] Trivial Update of "BranchManagement" by ChristopherLenz

Dear Wiki user,

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

The following page has been changed by ChristopherLenz:
http://wiki.apache.org/couchdb/BranchManagement

------------------------------------------------------------------------------
  
  Changes made in trunk need to be ported to the branch. This is done by utilizing [http://www.orcaware.com/svn/wiki/Svnmerge.py svnmerge].
  
+ To see the changes available for being merged, use the `svnmerge avail --log` command.
+ 
- To see the changes available for being merged, use the `svnmerge avail --log` command. To merge all the changes, use `svnmerge merge`. Or you can cherry-pick the changes to mark by specifying the revisions, for example `svnmerge merge -r 123-125,188. If there's some change that you don't want to port (possibly because it no longer applies to the code on the branch), use `snvmerge block -r 122`.
+ To merge all the changes, use `svnmerge merge`. Or you can cherry-pick the changes to mark by specifying the revisions, for example `svnmerge merge -r 123-125,188`. If there's some change that you don't want to port (possibly because it no longer applies to the code on the branch), use `svnmerge block -r 122`.
+ 
+ As always with merging (and patching), be careful about properly resolving conflicts.
  
  === Merging the Branch Back into Trunk ===
  
@@ -55, +59 @@

  
  === Further Reading ===
  
- See the [http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.patterns.feature Feature Branches chapter] in the [http://svnbook.red-bean.com/ SVN book], as well as the [http://www.orcaware.com/svn/wiki/Svnmerge.py svnmerge documentation] for more information.
+ See the [http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.patterns.feature Feature Branches] chapter in the [http://svnbook.red-bean.com/ SVN book], as well as the [http://www.orcaware.com/svn/wiki/Svnmerge.py svnmerge documentation] for more information.