/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/using_gatekeepers.txt
22
22
acceptable, indeed common, to have multiple central branches with
23
23
different gatekeepers, e.g. one branch for the current production
24
24
release and another for the next release. In this case, a task branch
25
 
holding a bug fix will most likely be advertised to both gatekeepers.
 
25
holding a bug fix will most likely be advertized to both gatekeepers.
26
26
 
27
27
One of the great things about this workflow is that it is hugely
28
28
scalable. Large projects can be broken into teams and each