~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to .bzrignore

  • Committer: Martin Pool
  • Date: 2005-07-04 13:08:55 UTC
  • Revision ID: mbp@sourcefrog.net-20050704130854-7fbef398256b8cab
- start code for built-in diff3-style resolve

- test cases for this

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
## *.diff
 
2
./doc/*.html
1
3
*.py[oc]
2
 
# These are created as byproducts of our test suite
3
 
./test*.tmp
4
 
./.python-eggs
5
 
./.bzr.log
6
 
# Generated files
 
4
*~
 
5
.arch-ids
 
6
.bzr.profile
 
7
.arch-inventory
 
8
{arch}
7
9
CHANGELOG
 
10
bzr-test.log
8
11
bzr.1
9
 
./doc/*.html
10
 
./tutorial.html
11
 
BRANCH-INFO
12
 
# setup.py working directory
13
 
build
14
 
# Editor temporary/working/backup files
15
 
*$
16
 
.*.sw[nop]
17
 
.sw[nop]
18
 
*~
19
 
[#]*#
20
 
.#*
21
 
./tags
22
 
# The shelf plugin uses this dir
23
 
./.shelf
24
 
# Mac droppings
25
 
.DS_Store
26
 
# win32 installer generated files
27
 
./doc/*.htm
28
 
./doc/bzr_man.txt
29
 
./py2exe.log
30
 
./tools/win32/bzr.iss
31
 
./dist
32
 
# performance history data file
33
 
./.perf_history
34
 
./html_docs
35
 
./pretty_docs
36
 
./api
37
 
doc/**/*.htm
38
 
doc/developers/performance.png
39
 
bzrlib/_dirstate_helpers_c.c
40
 
bzrlib/_knit_load_data_c.c
 
12
,,*
 
13
testbzr.log
 
14
api