cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Cassandra Wiki] Update of "HowToContribute" by DaveBrosius
Date Sat, 09 Mar 2013 01:30:43 GMT
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 DaveBrosius:
http://wiki.apache.org/cassandra/HowToContribute?action=diff&rev1=44&rev2=45

Comment:
switch instructions from svn to git

  <explanation>
  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 1.1, 1.2, and trunk, you would first commit to 1.1,
and push changes.  Then, switch to your 1.2 branch by doing
+ {{{ 
+     git checkout cassandra-1.2
+ }}}
+  and run 
+ {{{
+     git merge cassandra-1.2
+ }}}
+ If there are conflicts, resolve them and commit, followed by a push.  Finally, switch to
trunk by doing 
+ {{{
+     git checkout trunk
+ }}}
+ and run 
+ {{{
+     git merge cassandra-1.2
+ }}}
+ again resolve conflicts if the exist, and commit and push.
  
  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.
  

Mime
View raw message