lp:~vila/bzr/320119-exclude-ancestry

Created by Vincent Ladeuil on 2010-04-14 and last modified on 2010-04-28
Get this branch:
bzr branch lp:~vila/bzr/320119-exclude-ancestry
Only Vincent Ladeuil can upload to this branch. If you are Vincent Ladeuil please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Vincent Ladeuil
Project:
Bazaar
Status:
Merged

Recent revisions

5160. By Vincent Ladeuil on 2010-04-28

Fixed as per Andrew's review.

5159. By Vincent Ladeuil on 2010-04-28

Merge trunk

5158. By Vincent Ladeuil on 2010-04-14

Fix the performance by finding the relevant subgraph once.

* bzrlib/branch.py:
(Branch._filter_merge_sorted_revisions): Calculate the graph
difference once.

* bzrlib/tests/test_log.py:
(TestLogExcludeAncestry.make_branch_with_alternate_ancestries):
Make the test more obvious.

5157. By Vincent Ladeuil on 2010-04-14

Merge the bulg of the fix for 320119 and fix NEWS entrieS

5156. By Vincent Ladeuil on 2010-04-14

Merge log refactoring

5155. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-14

(andrew) Reset siginterrupt flag everytime we handle a signal to
 partially workaround http://bugs.python.org/issue8354.

5154. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-14

(robertc) Fix a harmless error in the testsuite (refactoring fallout on
 win32). (Martin [gz] list)

5153. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-14

(robertc) Do not warn when updating if a pending merge was merged into
 trunk. (Robert Collins, bug 562079)

5152. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-14

(andrew) Read-lock the trees and branches only once in cmd_diff.

5151. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-13

Warn when the working tree is dirty instead of failing for dpush,
 push and send

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr
This branch contains Public information 
Everyone can see this information.

Subscribers