- Committer: Canonical.com Patch Queue Manager
- Date: 2009-05-01 20:43:51 UTC
- mfrom: (4312.1.3 weave_conflict_delete_328171)
- Revision ID: pqm@pqm.ubuntu.com-20090501204351-ll10ketv3bu8plhx
(jam) Update 'bzr merge --weave' to generate conflicts when one side
modifies and one side deletes a line. (bug #328171)
modifies and one side deletes a line. (bug #328171)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
man1
|
2425.1.1 | 17 years ago | Robert Collins | ``make docs`` now creates a man page at ``man1/bzr |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
4280 | 15 years ago | Canonical.com Patch Queue Manager | (jam) Change _fetch_uses_deltas = False for CHK re | 1 KB |
|
|
|
.rsyncexclude |
1185.33.36 | 19 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
4265.1.1 | 15 years ago | John Arbash Meinel | Merge the a couple rev older brisbane-core into bz | 150 bytes |
|
|
bzr |
4104.1.11 | 15 years ago | Robert J. Tanner | [merge] bzr-1.13.2 back to trunk | 5.3 KB |
|
|
|
bzr.ico |
3688.3.3 | 16 years ago | John Arbash Meinel | An updated transparent icon for bzr. | 12.7 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
generate_docs.py |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 2.9 KB |
|
|
|
INSTALL |
2696.2.4 | 17 years ago | Aaron Bentley | Fix typo | 1.4 KB |
|
|
|
Makefile |
4202.5.1 | 15 years ago | Eric Siegerman | Don't generate HTML files for .txt's that are tran | 10.7 KB |
|
|
|
NEWS |
4322 | 15 years ago | Canonical.com Patch Queue Manager | (jam) Update 'bzr merge --weave' to generate confl | 336 KB |
|
|
|
profile_imports.py |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 5.5 KB |
|
|
|
README |
3286 | 16 years ago | Canonical.com Patch Queue Manager | Start 1.4 development | 3.3 KB |
|
|
|
setup.py |
4280 | 15 years ago | Canonical.com Patch Queue Manager | (jam) Change _fetch_uses_deltas = False for CHK re | 24.3 KB |
|
|
|
TODO |
2382.2.5 | 17 years ago | Martin Pool | Contents of TODO file moved into bug tracker | 115 bytes |
|
|