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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
bzr icon 16.png |
4634.39.10 | 16 years ago | Ian Clatworthy | split developer docs into their own website/chm fi | 809 bytes |
|
|
bzr-doc.css |
4806.1.1 | 16 years ago | Andrew Bennetts | Make sphinx respect 'loweralpha' style lists (a,b, | 51 bytes |
|
|
|
bzr.ico |
4634.39.10 | 16 years ago | Ian Clatworthy | split developer docs into their own website/chm fi | 12.7 KB |
|
|