/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/svn_plugin.txt

  • Committer: Vincent Ladeuil
  • Date: 2009-06-30 15:54:23 UTC
  • mto: (4496.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4497.
  • Revision ID: v.ladeuil+lp@free.fr-20090630155423-afousrl3zrdx0he2
Fixed as per jam's review.

* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.

* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.

* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/svn_plugin.txt
30
30
GNOME project like **beagle**. Firstly, setup a local shared repository
31
31
for storing your branches in and checkout the trunk::
32
32
 
33
 
  bzr init-repo beagle-repo
 
33
  bzr init-repo --default-rich-root beagle-repo
34
34
  cd beagle-repo
35
35
  bzr checkout svn+ssh://svn.gnome.org/svn/beagle/trunk beagle-trunk
36
36
 
37
 
Next, create a feature branch and hack away::
 
37
Note that using the ``default-rich-root`` option to ``init-repo`` is
 
38
important as bzr-svn requires some extra metadata not yet supported in Bazaar's
 
39
default repository format. Next, create a feature branch and hack away::
38
40
 
39
41
  bzr branch beagle-trunk beagle-feature1
40
42
  cd beagle-feature1
69
71
 
70
72
Here's the recipe from above updated to use a central Bazaar mirror::
71
73
 
72
 
  bzr init-repo beagle-repo
 
74
  bzr init-repo --default-rich-root beagle-repo
73
75
  cd beagle-repo
74
76
  bzr branch bzr+ssh://bzr.gnome.org/beagle.bzr/trunk beagle-trunk
75
77
  bzr branch beagle-trunk beagle-feature1