/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/developers/process.txt

  • Committer: Vincent Ladeuil
  • Date: 2009-10-06 14:40:37 UTC
  • mto: (4728.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4731.
  • Revision ID: v.ladeuil+lp@free.fr-20091006144037-o76rgosv9hj3td0y
Simplify mutable_tree.has_changes() and update call sites.

* bzrlib/workingtree.py:
(WorkingTree.merge_from_branch): Add a force parameter. Replace
the check_basis() call by the corresponding code, taken the new
'force' parameter into account.

* bzrlib/tests/test_status.py:
(TestStatus.make_multiple_pending_tree): Add force=True on
supplementary merges.

* bzrlib/tests/test_reconfigure.py:
(TestReconfigure): Add a test for pending merges.

* bzrlib/tests/test_msgeditor.py:
(MsgEditorTest.make_multiple_pending_tree): Add force=True on
supplementary merges.

* bzrlib/tests/blackbox/test_uncommit.py:
(TestUncommit.test_uncommit_octopus_merge): Add force=True on
supplementary merges.

* bzrlib/send.py:
(send): Use the simplified has_changes(). Fix typo in comment too.

* bzrlib/reconfigure.py:
(Reconfigure._check): Use the simplified has_changes().

* bzrlib/mutabletree.py:
(MutableTree.has_changes): Make the tree parameter optional but
retain it for tests. Add a pending merges check.

* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.file_revisions,
Merger.check_basis, Merger.compare_basis): Deprecate.

* bzrlib/bundle/apply_bundle.py:
(merge_bundle): Replace the check_basis() call by the
corresponding code.

* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use the
simplified has_changes().
(cmd_merge.run): Replace the check_basis call() by the corresponding
code (minus the alredy done has_changes() check).

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/process.txt
 
1
Bazaar Development Processes
 
2
============================
 
3
 
 
4
.. toctree::
 
5
   :hidden:
 
6
 
 
7
   cycle
 
8
   releasing
 
9
   ppa
 
10
   profiling
 
11
   ec2
 
12
   bug-handling
 
13
 
 
14
 
 
15
* `The Bazaar Development Cycle <cycle.html>`_ |--| The monthly
 
16
  development cycle and how to run it.
 
17
  
 
18
* `Releasing Bazaar <releasing.html>`_ |--| 
 
19
  Checklist to make a release of Bazaar.
 
20
 
 
21
* `Managing the Bazaar PPA <ppa.html>`_ |--| Packaging Bazaar for Ubuntu.
 
22
 
 
23
* `Giving back <http://bazaar-vcs.org/BzrGivingBack>`_ (wiki) |--| How to get
 
24
  your changes to Bazaar integrated into a release.
 
25
 
 
26
* `Profiling notes <profiling.html>`_ |--| Instructions on how to profile 
 
27
  bzr code and visualize the results.
 
28
 
 
29
* `EC2 resources <ec2.html>`_ |--| A team resource for 
 
30
  Windows packaging and testing, and Ubuntu testing.
 
31
 
 
32
* `Tracking Bugs in Bazaar <bug-handling.html>`_ |--| How we use the bug 
 
33
  tracker.
 
34
 
 
35
 
 
36
.. |--| unicode:: U+2014
 
37
 
 
38
..
 
39
   vim: ft=rst tw=74 ai