User Tools

Site Tools


using_bazaar

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
using_bazaar [2012/05/24 12:51]
mutil
using_bazaar [2012/09/13 13:18]
rryan [Making it work like SVN (a.k.a. Centralized Mode)]
Line 23: Line 23:
 ===== General procedure for distributed use ===== ===== General procedure for distributed use =====
  
-  - **Create a personal copy** (called a "​branch"​) of the Mixxx trunk/​branch you want to work on using ''​bzr branch lp:​mixxx''​ for trunk or ''​bzr branch lp:mixxx/1.8''​ for the 1.release branch. This copies the code to your local system. (**Be patient** as the Mixxx code base is fairly large and older versions of bzr sometimes have difficulty reporting progress.)+  - **Create a personal copy** (called a "​branch"​) of the Mixxx trunk/​branch you want to work on using ''​bzr branch lp:​mixxx''​ for trunk or ''​bzr branch lp:mixxx/1.x''​ for the 1.release branch ​(replace '​x'​ with the latest release branch -- as of Sep 2012 this is 1.11). This copies the code to your local system. (**Be patient** as the Mixxx code base is fairly large and older versions of bzr sometimes have difficulty reporting progress.)
   - **Make changes** to the code as desired. Every so often issue ''​bzr commit -m 'log message'''​ which will "​commit"​ the changes to your local store, allowing you to review or revert later.   - **Make changes** to the code as desired. Every so often issue ''​bzr commit -m 'log message'''​ which will "​commit"​ the changes to your local store, allowing you to review or revert later.
   - To periodically **update** from the parent, issue ''​bzr pull''​. If that gives you errors, (and it likely will if changes have been made to both) use ''​bzr merge''​ instead, since you're technically "​merging"​ the parent repository with your local one.   - To periodically **update** from the parent, issue ''​bzr pull''​. If that gives you errors, (and it likely will if changes have been made to both) use ''​bzr merge''​ instead, since you're technically "​merging"​ the parent repository with your local one.
Line 49: Line 49:
 ===== Making it work like SVN (a.k.a. Centralized Mode) ===== ===== Making it work like SVN (a.k.a. Centralized Mode) =====
 (For those of us scared of this "​distributed"​ thing...) (For those of us scared of this "​distributed"​ thing...)
-  * **Check out** with ''​bzr checkout lp:​mixxx''​ for trunk or ''​bzr checkout lp:mixxx/1.8''​ for the 1.release branch. (**Be patient** as the Mixxx code base is fairly large and older versions of bzr sometimes have difficulty reporting progress.)+  * **Check out** with ''​bzr checkout lp:​mixxx''​ for trunk or ''​bzr checkout lp:mixxx/1.x''​ for the 1.release branch ​(replace '​x'​ with the latest release branch – as of Sep 2012 this is 1.11). (**Be patient** as the Mixxx code base is fairly large and older versions of bzr sometimes have difficulty reporting progress.)
   * **Update** to latest version with ''​bzr update''​   * **Update** to latest version with ''​bzr update''​
   * **Create a patch** with ''​bzr diff > mychanges.patch''​ and attach it to a bug at [[http://​bugs.launchpad.net/​mixxx|Launchpad]].   * **Create a patch** with ''​bzr diff > mychanges.patch''​ and attach it to a bug at [[http://​bugs.launchpad.net/​mixxx|Launchpad]].
   * If you have commit access, **commit** with ''​bzr commit -m "Log message"''​ (You'​ll need to register an SSH key first under your personal LP page: https://​launchpad.net/​people/​+me/​+editsshkeys.)   * If you have commit access, **commit** with ''​bzr commit -m "Log message"''​ (You'​ll need to register an SSH key first under your personal LP page: https://​launchpad.net/​people/​+me/​+editsshkeys.)
- 
 ===== Automatic submission to CIA ===== ===== Automatic submission to CIA =====
  
using_bazaar.txt · Last modified: 2012/09/13 13:18 by rryan