- Committer: Martin Pool
- Date: 2005-11-16 07:47:03 UTC
- mto: (1185.74.1 bzr.dev (Main development branch)) (1505.1.18 bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- Revision ID: mbp@sourcefrog.net-20051116074703-03f47cbe4a4f1e43
Add test for merging metadata change vs file deletion
(currently passes but should fail)
(currently passes but should fail)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1 | 19 years ago | mbp at sourcefrog | import from baz patch-364 |
|
||
|
contrib
|
331 | 19 years ago | Martin Pool | - sketchy experiments in bash and zsh completion |
|
||
|
doc
|
6 | 19 years ago | mbp at sourcefrog | import all docs from arch |
|
||
|
notes
|
10 | 19 years ago | mbp at sourcefrog | import more files from baz |
|
||
|
patches
|
520 | 19 years ago | Martin Pool | - add space for un-merged patches |
|
||
|
tools
|
854 | 19 years ago | Martin Pool | - rearrange and clear up merged weave |
|
||
.bzrignore |
1185.12.3 | 19 years ago | Aaron Bentley | Ignored user-installed plugins | 207 bytes |
|
|
|
.rsyncexclude |
1185.16.34 | 19 years ago | Martin Pool | - ignore .swp files from upload | 176 bytes |
|
|
|
build-api |
496 | 19 years ago | Martin Pool | - patch from ddaa to create api/ directory befo | 88 bytes |
|
|
bzr |
1185.35.13 | 19 years ago | Aaron Bentley | Merged Martin | 2.3 KB |
|
|
|
bzr_man.py |
1185.29.2 | 19 years ago | Wouter van Heyst | Kill the python reinvocation, it doesn't work for | 6.8 KB |
|
|
|
HACKING |
1185.33.3 | 19 years ago | Martin Pool | [merge] jelmer | 8.3 KB |
|
|
|
INSTALL |
1185.16.80 | 19 years ago | Martin Pool | Update news and readme - better explanation of de | 437 bytes |
|
|
|
Makefile |
1185.21.3 | 19 years ago | Jelmer Vernooij | Remove executable properties from Makefile (set by | 260 bytes |
|
|
|
NEWS |
1185.33.21 | 19 years ago | Martin Pool | Document BZR_PDB | 30.1 KB |
|
|
|
NEWS.developers |
1185.16.35 | 19 years ago | Martin Pool | - stub for revision properties | 910 bytes |
|
|
|
README |
1185.16.148 | 19 years ago | Martin Pool | Add pointer from README to INSTALL | 808 bytes |
|
|
|
setup.py |
1185.16.144 | 19 years ago | Martin Pool | Bump version to 0.7pre | 2.9 KB |
|
|
|
testbzr |
736 | 19 years ago | Martin Pool | - move old blackbox code from testbzr into bzrlib. | 845 bytes |
|
|
|
TODO |
1185.34.4 | 19 years ago | Jelmer Vernooij | Support -r option to bzr status. The backend code | 16.6 KB |
|
|
|
tutorial.txt |
1185.1.13 | 19 years ago | Robert Collins | and the tutorial patch came back, the very next da | 9.9 KB |
|
|