← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to .bzrignore

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 20:51:58 UTC
  • mto: (4634.119.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: john@arbash-meinel.com-20100112205158-ka4r62tpmtf3aglg
https://launchpad.net/bugs/504390
Fix a bug in the dirstate logic for 'set_path_id'.

It was a bit tricky to sort out, because it depends on the sort order
of sets. Basically 'set_path_id' was accidentally adding the old
file-id a a location to get the entry for the new file-id.
And then the _get_entry lookup would see that the entry was
absent in the given tree (because it doesn't validate that the
file-id for the entry line actually matches the file-id supplied).

Show diffs side-by-side

added added

removed removed

Lines of Context:
.bzrignore
1
 
./doc/*.html
2
1
*.py[oc]
 
2
# These are created as byproducts of our test suite
 
3
./test*.tmp
 
4
./.python-eggs
 
5
./.bzr.log
 
6
# Generated files
 
7
CHANGELOG
 
8
# generated documents
 
9
bzr.1
 
10
./doc/*.html
 
11
./doc/*/_build/
 
12
./doc/*/Makefile
 
13
./doc/*/make.bat
 
14
./tutorial.html
 
15
./build_doc_website
 
16
./html_docs
 
17
./pretty_docs
 
18
./api
 
19
./doc/**/*.html
 
20
./doc/developers/performance.png
 
21
./doc/en/user-reference/*.txt
 
22
./doc/en/release-notes/*.txt
 
23
BRANCH-INFO
 
24
# setup.py working directory
 
25
./build
 
26
./build-win32
 
27
# Editor temporary/working/backup files
 
28
*$
 
29
.*.sw[nop]
 
30
.sw[nop]
3
31
*~
4
 
.arch-ids
5
 
.bzr.profile
6
 
.arch-inventory
7
 
{arch}
8
 
CHANGELOG
9
 
bzr-test.log
10
 
,,*
11
 
testbzr.log
 
32
[#]*#
 
33
.#*
 
34
./tags
 
35
./bzrlib/tags
 
36
./TAGS
 
37
# The shelf plugin uses this dir
 
38
./.shelf
 
39
# Mac droppings
 
40
.DS_Store
 
41
# win32 installer generated files
 
42
./doc/*.html
 
43
./doc/bzr_man.txt
 
44
./py2exe.log
 
45
./tools/win32/bzr.iss
 
46
./dist
 
47
# performance history data file
 
48
./.perf_history
 
49
# Pyrex
 
50
bzrlib/_annotator_pyx.c
 
51
bzrlib/_bencode_pyx.c
 
52
bzrlib/_btree_serializer_pyx.c
 
53
bzrlib/_chk_map_pyx.c
 
54
bzrlib/_chunks_to_lines_pyx.c
 
55
bzrlib/_dirstate_helpers_pyx.c
 
56
bzrlib/_groupcompress_pyx.c
 
57
bzrlib/_knit_load_data_pyx.c
 
58
bzrlib/_known_graph_pyx.c
 
59
bzrlib/_readdir_pyx.c
 
60
bzrlib/_rio_pyx.c
 
61
bzrlib/_walkdirs_win32.c
 
62
# built extension modules
 
63
bzrlib/_*.dll
 
64
bzrlib/_*.so
 
65
bzrlib/_*.pyd
 
66
./.ccache