You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by Apache Wiki <wi...@apache.org> on 2011/02/07 19:48:28 UTC

[Cassandra Wiki] Trivial Update of "HowToContribute" by JonathanEllis

Dear Wiki user,

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

The "HowToContribute" page has been changed by JonathanEllis.
http://wiki.apache.org/cassandra/HowToContribute?action=diff&rev1=35&rev2=36

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

  patch by <author>; reviewed by <committer> for CASSANDRA-<ticket>
  }}}
  
- When committing to multiple branches, start with the most-stable and merge forwards.  For instance, if you had a fix to apply to 0.6, 0.7, and trunk, you would first commit to 0.6.  Then, from your 0.7 branch checkout, you would run "svn merge !https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.6", resolve any conflicts, and commit.  Then, from your trunk checkout, you would run "svn merge !https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7", again resolve conflicts, and commit.
+ When committing to multiple branches, start with the most-stable and merge forwards.  For instance, if you had a fix to apply to 0.6, 0.7, and trunk, you would first commit to 0.6.  Then, from your 0.7 branch checkout, you would run "svn merge https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.6", resolve any conflicts, and commit.  Then, from your trunk checkout, you would run "svn merge https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7", again resolve conflicts, and commit.
  
  See http://video.google.com/videoplay?docid=-577744660535947210 for an in-depth explanation of why fixes should be merged forwards from more-stable branches, rather than backported from trunk.