/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/ru/quick-reference/Makefile

  • Committer: Vincent Ladeuil
  • Date: 2009-09-08 16:45:11 UTC
  • mto: (4681.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4682.
  • Revision ID: v.ladeuil+lp@free.fr-20090908164511-5e7eupewxycwaue4
Don't allow remove-tree to succeed with pending merges unless
--force is used.

* bzrlib/tests/blackbox/test_remove_tree.py:
(TestRemoveTree.test_remove_tree_pending_merges,
TestRemoveTree.test_remove_tree_pending_merges_force): Test with
and without --force and pending merges.

* bzrlib/builtins.py:
(cmd_remove_tree.run): Check pending merges too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/ru/quick-reference/Makefile
1
 
TARGETS=bzr-quick-reference.png bzr-quick-reference.pdf
2
 
OBJECTS=bzr-quick-reference.svg Makefile
 
1
TARGETS=quick-start-summary.png quick-start-summary.pdf
 
2
OBJECTS=quick-start-summary.svg Makefile
3
3
 
4
4
all: $(TARGETS)
5
5
 
11
11
.svg.png:
12
12
        rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<
13
13
 
14
 
bzr-quick-reference.png: $(OBJECTS)
 
14
bzr-quickref.png: $(OBJECTS)
15
15
 
16
 
bzr-quick-reference.pdf: $(OBJECTS)
 
16
bzr-quickref.pdf: $(OBJECTS)
17
17
 
18
18
clean:
19
19
        rm -f $(TARGETS)