Bazaar

Merge lp:~lifeless/bzr/bug-422849 into lp:bzr/2.0

  1. bug-422849
  2. Merge into 2.0
Proposed by Robert Collins
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lifeless/bzr/bug-422849
Merge into: lp:bzr/2.0
Diff against target: 38 lines
To merge this branch: bzr merge lp:~lifeless/bzr/bug-422849
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+11023@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Bug fix for 422849, no tests as yet. Should pass PQM as the error is solely an aliasing bug.

Revision history for this message
Martin Pool (mbp) wrote :

> Bug fix for 422849, no tests as yet. Should pass PQM as the error is solely an
> aliasing bug.

In interactive testing this seems to be fixing the conversion that previously failed for me, but it hasn't finished yet.

Revision history for this message
John A Meinel (jameinel) wrote :

Of course, it would be nice to have a test here, but getting the fix in prevents people from borking their codebase.

review: Approve
Revision history for this message
Martin Pool (mbp) wrote :

> In interactive testing this seems to be fixing the conversion that previously
> failed for me, but it hasn't finished yet.

It did complete and I'm now checking it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2009-08-31 00:25:33 +0000
3+++ NEWS 2009-09-02 00:35:10 +0000
4@@ -24,6 +24,10 @@
5 that has a ghost in the mainline ancestry.
6 (John Arbash Meinel, #419241)
7
8+* Local data conversion will generate correct deltas. This is a critical
9+ bugfix vs 2.0rc1, and all 2.0rc1 users should upgrade to 2.0rc2 before
10+ converting repositories. (Robert Collins, #422849)
11+
12 Documentation
13 *************
14
15
16=== modified file 'bzrlib/repository.py'
17--- bzrlib/repository.py 2009-08-30 22:02:45 +0000
18+++ bzrlib/repository.py 2009-09-02 00:35:10 +0000
19@@ -3844,6 +3844,9 @@
20 possible_trees.append((basis_id, cache[basis_id]))
21 basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
22 possible_trees)
23+ revision = self.source.get_revision(current_revision_id)
24+ pending_deltas.append((basis_id, delta,
25+ current_revision_id, revision.parent_ids))
26 if self._converting_to_rich_root:
27 self._revision_id_to_root_id[current_revision_id] = \
28 tree.get_root_id()
29@@ -3878,9 +3881,6 @@
30 if entry.revision == file_revision:
31 texts_possibly_new_in_tree.remove(file_key)
32 text_keys.update(texts_possibly_new_in_tree)
33- revision = self.source.get_revision(current_revision_id)
34- pending_deltas.append((basis_id, delta,
35- current_revision_id, revision.parent_ids))
36 pending_revisions.append(revision)
37 cache[current_revision_id] = tree
38 basis_id = current_revision_id

Subscribers

People subscribed via source and target branches