/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/Makefile

  • Committer: Martin Pool
  • Date: 2005-06-06 04:17:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050606041753-abe590daf0d7f959
Updated merge patch from Aaron

This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/Makefile
 
1
all: $(addsuffix .html,$(basename $(wildcard *.txt))) todo.html
 
2
 
 
3
clean:
 
4
        -rm *.html
 
5
 
 
6
%.html: %.txt
 
7
        rest2html $^ > $@.tmp && mv $@.tmp $@
 
8
 
 
9
todo.html: ../TODO
 
10
        rest2html $^ > $@.tmp && mv $@.tmp $@
 
11
 
 
12
 
 
13
 
 
14
upload: all
 
15
        rsync -av \
 
16
        ./ \
 
17
        escudero.ubuntu.com:/srv/www.bazaar-ng.org/www/doc/ \
 
18
        --delete \
 
19
        --include \*.html --exclude \* 
 
20