To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: John Arbash Meinel
- Date: 2013-05-28 08:11:13 UTC
- mto: (6015.57.8 2.4)
- Revision ID: john@arbash-meinel.com-20130528081113-azyyvad54c3am2oq
Backport the fix for bug #855155 to bzr-2.4
Dirstate.update_basis_by_delta had a logic flaw where if it got a delta that added files to
an otherwise empty directory, it would notice that the dirblock didn't exist,
and it would claim the delta was invalid, rather than noticing the parent
directory did exist, it just had an empty (thus nonexistent) block.
This never triggered in commit, because you always have the files in 'current'
which forces the block to exist. But things like uncommit can change the basis
without touching current.
Dirstate.update_basis_by_delta had a logic flaw where if it got a delta that added files to
an otherwise empty directory, it would notice that the dirblock didn't exist,
and it would claim the delta was invalid, rather than noticing the parent
directory did exist, it just had an empty (thus nonexistent) block.
This never triggered in commit, because you always have the files in 'current'
which forces the block to exist. But things like uncommit can change the basis
without touching current.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
developers
|
2481.1.1 | 18 years ago | Robert Collins | Move HACKING to docs/developers/HACKING and adjust |
|
||
|
en
|
2691.1.1 | 18 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||
|
es
|
3405.2.1 | 17 years ago | Martin Albisetti | * Added directory structure for docs en spanish |
|
||
|
ja
|
4634.99.1 | 16 years ago | Naoki INADA | import doc-ja rev90 |
|
||
|
ru
|
3638.6.1 | 17 years ago | Alexey Shtokalo | Initial commit for russian version of documents. |
|
||
Bazaar-Logo-For-Manuals.png |
4634.38.1 | 16 years ago | Ian Clatworthy | first cut at pdf docs via sphinx | 3.7 KB |
|
|
default.css |
4853.1.1 | 16 years ago | Patrick Regan | Removed trailing whitespace from files in doc dire | 2 KB |
|
|
|
index.es.txt |
5050.22.1 | 15 years ago | John Arbash Meinel | Lots of documentation updates. We had a lot of ht | 1.3 KB |
|
|
|
index.ja.txt |
5377.2.1 | 15 years ago | Andrew Bennetts | Merge lp:bzr/2.2 into lp:bzr, including fixes for | 3 KB |
|
|
|
index.ru.txt |
5377.2.1 | 15 years ago | Andrew Bennetts | Merge lp:bzr/2.2 into lp:bzr, including fixes for | 2.5 KB |
|
|
|
index.txt |
5377.2.1 | 15 years ago | Andrew Bennetts | Merge lp:bzr/2.2 into lp:bzr, including fixes for | 1.8 KB |
|
|
|
news-template.txt |
3936.1.2 | 17 years ago | Martin Pool | Bump version to 1.12 and add news template | 169 bytes |
|
|