~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/zen.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-03 15:02:09 UTC
  • mfrom: (4398.2.1 export-test-fix)
  • Revision ID: pqm@pqm.ubuntu.com-20090603150209-szap3popp2j8fpl3
(John Szakmeister) Fix error formatting for tar related KnowFailure
        on Mac

Show diffs side-by-side

added added

removed removed

Lines of Context:
56
56
  102: Add code and tests for X
57
57
  101: Add tests for Y
58
58
  100: ...
59
 
 
 
59
  
60
60
Many teams use this approach because their tools make branching and merging
61
61
difficult. As a consequence, developers update from and commit to the trunk
62
62
frequently, minimizing integration pain by spreading it over every commit.