Rev 2905: (Andrew Bennetts, Aaron Bentley) Reconcile can fix bad parent references. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Oct 12 04:57:29 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2905
revision-id: pqm at pqm.ubuntu.com-20071012035726-d8e3stq343fqi0bz
parent: pqm at pqm.ubuntu.com-20071010085229-7x5al1tirr29mq0l
parent: andrew.bennetts at canonical.com-20071012031808-jqscjrd5r7dl1w6o
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-10-12 04:57:26 +0100
message:
(Andrew Bennetts, Aaron Bentley) Reconcile can fix bad parent references.
added:
bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2745.6.62
merged: andrew.bennetts at canonical.com-20071012031808-jqscjrd5r7dl1w6o
parent: andrew.bennetts at canonical.com-20071012030652-0y03j7ars6vl5q1w
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-12 13:18:08 +1000
message:
Revert a new DeprecationWarning; will submit that in a separate branch.
------------------------------------------------------------
revno: 2745.6.61
merged: andrew.bennetts at canonical.com-20071012030652-0y03j7ars6vl5q1w
parent: andrew.bennetts at canonical.com-20071012024758-02qsa8s8755ql792
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-12 13:06:52 +1000
message:
Remove some useless mutters, and cope with a file_id that isn't present in a revision's inventory.
------------------------------------------------------------
revno: 2745.6.60
merged: andrew.bennetts at canonical.com-20071012024758-02qsa8s8755ql792
parent: andrew.bennetts at canonical.com-20071012020759-du624xd71yztqmua
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-12 12:47:58 +1000
message:
Remove duplicate __init__ method from a bad conflict resolution.
------------------------------------------------------------
revno: 2745.6.59
merged: andrew.bennetts at canonical.com-20071012020759-du624xd71yztqmua
parent: andrew.bennetts at canonical.com-20071012015229-7tiowt5moo4yqs2g
parent: pqm at pqm.ubuntu.com-20071010085229-7x5al1tirr29mq0l
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-12 12:07:59 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2745.6.58
merged: andrew.bennetts at canonical.com-20071012015229-7tiowt5moo4yqs2g
parent: andrew.bennetts at canonical.com-20071011070104-9rfs3gv9zknm09i8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-12 11:52:29 +1000
message:
Slightly neater test parameterisation in repository_implementations; extract a 'multiply_scenarios' function.
------------------------------------------------------------
revno: 2745.6.57
merged: andrew.bennetts at canonical.com-20071011070104-9rfs3gv9zknm09i8
parent: andrew.bennetts at canonical.com-20071005030813-bdrd5k21y2kvyhqe
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Thu 2007-10-11 17:01:04 +1000
message:
Some improvements suggested by Martin's review.
------------------------------------------------------------
revno: 2745.6.56
merged: andrew.bennetts at canonical.com-20071005030813-bdrd5k21y2kvyhqe
parent: andrew.bennetts at canonical.com-20071005030620-opaj0hufjx285iz3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 13:08:13 +1000
message:
Remove unused import.
------------------------------------------------------------
revno: 2745.6.55
merged: andrew.bennetts at canonical.com-20071005030620-opaj0hufjx285iz3
parent: andrew.bennetts at canonical.com-20071005030535-9rvp52gyb0i99hf2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 13:06:20 +1000
message:
Remove large unexplained comment.
------------------------------------------------------------
revno: 2745.6.54
merged: andrew.bennetts at canonical.com-20071005030535-9rvp52gyb0i99hf2
parent: andrew.bennetts at canonical.com-20071005021909-0aasrbkl05ux5ok2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 13:05:35 +1000
message:
Tidy test parameterisation in repository_implementations.
------------------------------------------------------------
revno: 2745.6.53
merged: andrew.bennetts at canonical.com-20071005021909-0aasrbkl05ux5ok2
parent: andrew.bennetts at canonical.com-20071005021853-q410n3kcldnnp2ms
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 12:19:09 +1000
message:
Some more changes suggested by review.
------------------------------------------------------------
revno: 2745.6.52
merged: andrew.bennetts at canonical.com-20071005021853-q410n3kcldnnp2ms
parent: andrew.bennetts at canonical.com-20071005020458-015jmnronko3w4wz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 12:18:53 +1000
message:
Revert bad change to bzrlib/progress.py
------------------------------------------------------------
revno: 2745.6.51
merged: andrew.bennetts at canonical.com-20071005020458-015jmnronko3w4wz
parent: andrew.bennetts at canonical.com-20071005015616-zs4yna6h5dsen33n
parent: pqm at pqm.ubuntu.com-20071004215001-549ul8av89cwpnjp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 12:04:58 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2745.6.50
merged: andrew.bennetts at canonical.com-20071005015616-zs4yna6h5dsen33n
parent: andrew.bennetts at canonical.com-20071005010534-q3n044bw7wr5qe5s
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 11:56:16 +1000
message:
Remove find_bad_ancestors; it's not needed anymore.
------------------------------------------------------------
revno: 2745.6.49
merged: andrew.bennetts at canonical.com-20071005010534-q3n044bw7wr5qe5s
parent: andrew.bennetts at canonical.com-20071005005237-rlgbshfgenspobfd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 11:05:34 +1000
message:
Get rid of bzrlib.repository._RevisionParentsProvider.
------------------------------------------------------------
revno: 2745.6.48
merged: andrew.bennetts at canonical.com-20071005005237-rlgbshfgenspobfd
parent: andrew.bennetts at canonical.com-20071005004453-01gpk6nnh4zelciv
parent: andrew.bennetts at canonical.com-20070924034521-hbp0u7drdwzgx8b0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 10:52:37 +1000
message:
Merge find-inconsistent-parents.
------------------------------------------------------------
revno: 2819.2.5
merged: andrew.bennetts at canonical.com-20070924034521-hbp0u7drdwzgx8b0
parent: andrew.bennetts at canonical.com-20070924025530-una2yvejg4w9xxfe
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: find-inconsistent-parents
timestamp: Mon 2007-09-24 13:45:21 +1000
message:
Make reconcile abort gracefully if the revision index has bad parents.
------------------------------------------------------------
revno: 2819.2.4
merged: andrew.bennetts at canonical.com-20070924025530-una2yvejg4w9xxfe
parent: andrew.bennetts at canonical.com-20070924023610-2y6idadfs0b63yid
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: find-inconsistent-parents
timestamp: Mon 2007-09-24 12:55:30 +1000
message:
Add a 'revision_graph_can_have_wrong_parents' method to repository.
------------------------------------------------------------
revno: 2819.2.3
merged: andrew.bennetts at canonical.com-20070924023610-2y6idadfs0b63yid
parent: andrew.bennetts at canonical.com-20070917053121-nfmxkem2dsjyvkn9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: find-inconsistent-parents
timestamp: Mon 2007-09-24 12:36:10 +1000
message:
Add test that repo.check will report on wrong parents in the revision graph.
------------------------------------------------------------
revno: 2819.2.2
merged: andrew.bennetts at canonical.com-20070917053121-nfmxkem2dsjyvkn9
parent: andrew.bennetts at canonical.com-20070914041757-bdwh2flaqzg3i2dc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: find-inconsistent-parents
timestamp: Mon 2007-09-17 15:31:21 +1000
message:
Implement _check_for_inconsistent_revision_parents.
------------------------------------------------------------
revno: 2819.2.1
merged: andrew.bennetts at canonical.com-20070914041757-bdwh2flaqzg3i2dc
parent: pqm at pqm.ubuntu.com-20070914004213-xraql0v7q1p63j81
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: find-inconsistent-parents
timestamp: Fri 2007-09-14 14:17:57 +1000
message:
Implement KnitRepository._find_inconsistent_revision_parents.
------------------------------------------------------------
revno: 2745.6.47
merged: andrew.bennetts at canonical.com-20071005004453-01gpk6nnh4zelciv
parent: andrew.bennetts at canonical.com-20071003105407-9919mihbgf9lex2u
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-10-05 10:44:53 +1000
message:
Move check_parents out of VersionedFile.
------------------------------------------------------------
revno: 2745.6.46
merged: andrew.bennetts at canonical.com-20071003105407-9919mihbgf9lex2u
parent: andrew.bennetts at canonical.com-20071003074517-z5e7160ghne10iha
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-10-03 20:54:07 +1000
message:
Improvements to check/reconcile tests suggested by review.
------------------------------------------------------------
revno: 2745.6.45
merged: andrew.bennetts at canonical.com-20071003074517-z5e7160ghne10iha
parent: andrew.bennetts at canonical.com-20070928140952-y38sjgu499ps9x98
parent: pqm at pqm.ubuntu.com-20071003070115-95pox4ok1e47a7v0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-10-03 17:45:17 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2745.6.44
merged: andrew.bennetts at canonical.com-20070928140952-y38sjgu499ps9x98
parent: andrew.bennetts at canonical.com-20070928140701-33rm117ngp647nby
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Sat 2007-09-29 00:09:52 +1000
message:
More docstring and formatting tweaks.
------------------------------------------------------------
revno: 2745.6.43
merged: andrew.bennetts at canonical.com-20070928140701-33rm117ngp647nby
parent: andrew.bennetts at canonical.com-20070928125656-nifdam2jdirp3jv4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Sat 2007-09-29 00:07:01 +1000
message:
Tidy imports, docstrings, comments and variable names.
------------------------------------------------------------
revno: 2745.6.42
merged: andrew.bennetts at canonical.com-20070928125656-nifdam2jdirp3jv4
parent: andrew.bennetts at canonical.com-20070928103446-rkg87cfjphhp5ce2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 22:56:56 +1000
message:
Use TestScenarioApplier to more cleanly parameterise check and reconcile tests.
------------------------------------------------------------
revno: 2745.6.41
merged: andrew.bennetts at canonical.com-20070928103446-rkg87cfjphhp5ce2
parent: andrew.bennetts at canonical.com-20070928082722-bs4py4mmjds4g0ol
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 20:34:46 +1000
message:
Test repo.check against all_scenarios.
------------------------------------------------------------
revno: 2745.6.40
merged: andrew.bennetts at canonical.com-20070928082722-bs4py4mmjds4g0ol
parent: andrew.bennetts at canonical.com-20070928081816-lr6osqf34xiztnff
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 18:27:22 +1000
message:
Use all_scenarios to automatically test reconcile on every scenario.
------------------------------------------------------------
revno: 2745.6.39
merged: andrew.bennetts at canonical.com-20070928081816-lr6osqf34xiztnff
parent: andrew.bennetts at canonical.com-20070928072843-kwuv6u9jnj6zr09y
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 18:18:16 +1000
message:
Use scenario in test_check too, and make check actually report inconsistent parents to the end user.
------------------------------------------------------------
revno: 2745.6.38
merged: andrew.bennetts at canonical.com-20070928072843-kwuv6u9jnj6zr09y
parent: andrew.bennetts at canonical.com-20070928055343-dw35k3iakhcpd26g
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 17:28:43 +1000
message:
Create explicit scenario objects for test_reconcile.
------------------------------------------------------------
revno: 2745.6.37
merged: andrew.bennetts at canonical.com-20070928055343-dw35k3iakhcpd26g
parent: andrew.bennetts at canonical.com-20070928044046-fyl5mq8gszi78g5y
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 15:53:43 +1000
message:
Extract out a calculate_parents method from find_bad_ancestors.
------------------------------------------------------------
revno: 2745.6.36
merged: andrew.bennetts at canonical.com-20070928044046-fyl5mq8gszi78g5y
parent: andrew.bennetts at canonical.com-20070928043209-uqwx5f2hg1zh0tl9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 14:40:46 +1000
message:
Deprecate revision_ids arg to Repository.check and other tweaks.
------------------------------------------------------------
revno: 2745.6.35
merged: andrew.bennetts at canonical.com-20070928043209-uqwx5f2hg1zh0tl9
parent: andrew.bennetts at canonical.com-20070928043028-fjnu8nbdsaeu8tre
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 14:32:09 +1000
message:
Remove some cruft, including messy test that is no longer needed.
------------------------------------------------------------
revno: 2745.6.34
merged: andrew.bennetts at canonical.com-20070928043028-fjnu8nbdsaeu8tre
parent: andrew.bennetts at canonical.com-20070928041043-kw5wdguzznj8rw9w
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 14:30:28 +1000
message:
Remove _find_correct_parents from reconcile; use the result of vf.check_parents() instead.
------------------------------------------------------------
revno: 2745.6.33
merged: andrew.bennetts at canonical.com-20070928041043-kw5wdguzznj8rw9w
parent: andrew.bennetts at canonical.com-20070926110703-wvseka8at7kvequ3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Fri 2007-09-28 14:10:43 +1000
message:
Add VersionedFile.check_parents, and use it instead of find_bad_ancestors in reconcile.
------------------------------------------------------------
revno: 2745.6.32
merged: andrew.bennetts at canonical.com-20070926110703-wvseka8at7kvequ3
parent: andrew.bennetts at canonical.com-20070926104946-czaclv7nxty8o5v7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 21:07:03 +1000
message:
Some testing notes, test reorganisation, XXX comments and some failing tests.
------------------------------------------------------------
revno: 2745.6.31
merged: andrew.bennetts at canonical.com-20070926104946-czaclv7nxty8o5v7
parent: andrew.bennetts at canonical.com-20070926104710-vvwheauxy7pwgpds
parent: mbp at sourcefrog.net-20070925062946-1tlmmt604lf9bllm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 20:49:46 +1000
message:
Merge unprintable error fix from Martin.
------------------------------------------------------------
revno: 2745.6.30
merged: andrew.bennetts at canonical.com-20070926104710-vvwheauxy7pwgpds
parent: andrew.bennetts at canonical.com-20070926041631-ji9vyybepltxfelc
parent: pqm at pqm.ubuntu.com-20070925041614-j2r43hi8rhw9ci4k
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 20:47:10 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2745.6.29
merged: andrew.bennetts at canonical.com-20070926041631-ji9vyybepltxfelc
parent: andrew.bennetts at canonical.com-20070926022449-8ch2teulxyvjzbpl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 14:16:31 +1000
message:
Change the 'add_file' helper to a slightly more convenient 'make_one_file_inventory' helper.
------------------------------------------------------------
revno: 2745.6.28
merged: andrew.bennetts at canonical.com-20070926022449-8ch2teulxyvjzbpl
parent: andrew.bennetts at canonical.com-20070926014723-8etlb9qzh23amc2a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 12:24:49 +1000
message:
Consistently refer to the file in the test repo as 'a-file'.
------------------------------------------------------------
revno: 2745.6.27
merged: andrew.bennetts at canonical.com-20070926014723-8etlb9qzh23amc2a
parent: andrew.bennetts at canonical.com-20070926013734-3malrjmo88m3zq20
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 11:47:23 +1000
message:
Docstring for the 'run_test' helper.
------------------------------------------------------------
revno: 2745.6.26
merged: andrew.bennetts at canonical.com-20070926013734-3malrjmo88m3zq20
parent: andrew.bennetts at canonical.com-20070926013218-34m3u9bifnzlpv71
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 11:37:34 +1000
message:
Always use the same fileid in TestReconcileFileVersionParents.
------------------------------------------------------------
revno: 2745.6.25
merged: andrew.bennetts at canonical.com-20070926013218-34m3u9bifnzlpv71
parent: andrew.bennetts at canonical.com-20070925173808-w9wi66pq94n1o85z
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 11:32:18 +1000
message:
Better test names and structure.
------------------------------------------------------------
revno: 2745.6.24
merged: andrew.bennetts at canonical.com-20070925173808-w9wi66pq94n1o85z
parent: andrew.bennetts at canonical.com-20070924050400-e6jqvf35a25jg146
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Wed 2007-09-26 03:38:08 +1000
message:
Lots of test refactoring.
------------------------------------------------------------
revno: 2745.6.23
merged: andrew.bennetts at canonical.com-20070924050400-e6jqvf35a25jg146
parent: andrew.bennetts at canonical.com-20070924044354-yb0yatqs4rcdhzyx
parent: andrew.bennetts at canonical.com-20070924050151-mx66j2h0dabqnd9s
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Mon 2007-09-24 15:04:00 +1000
message:
Merge bzr.dev + RemoteRepository.get_graph fix.
------------------------------------------------------------
revno: 2850.4.1
merged: andrew.bennetts at canonical.com-20070924050151-mx66j2h0dabqnd9s
parent: pqm at pqm.ubuntu.com-20070923210826-t3ymvo1l68z96in1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-repo-get_graph
timestamp: Mon 2007-09-24 15:01:51 +1000
message:
Add smoketest for repo.get_graph, and fix bug in RemoteRepository.get_graph that it reveals.
------------------------------------------------------------
revno: 2745.6.22
merged: andrew.bennetts at canonical.com-20070924044354-yb0yatqs4rcdhzyx
parent: andrew.bennetts at canonical.com-20070920060402-gwzon2kz678wzims
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Mon 2007-09-24 14:43:54 +1000
message:
Improve docstrings/comments in the test file.
------------------------------------------------------------
revno: 2745.6.21
merged: andrew.bennetts at canonical.com-20070920060402-gwzon2kz678wzims
parent: andrew.bennetts at canonical.com-20070920055800-tzqt95dqxovb9bpq
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Thu 2007-09-20 16:04:02 +1000
message:
Docstring.
------------------------------------------------------------
revno: 2745.6.20
merged: andrew.bennetts at canonical.com-20070920055800-tzqt95dqxovb9bpq
parent: andrew.bennetts at canonical.com-20070920022717-0zwv541vfpxz2j9a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Thu 2007-09-20 15:58:00 +1000
message:
Add a test for the new check, and some refactoring.
------------------------------------------------------------
revno: 2745.6.19
merged: andrew.bennetts at canonical.com-20070920022717-0zwv541vfpxz2j9a
parent: andrew.bennetts at canonical.com-20070920011908-dup06dzpikk3lf0q
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Thu 2007-09-20 12:27:17 +1000
message:
Find discrepancies between the calculated heads and the parents in the knit index.
------------------------------------------------------------
revno: 2745.6.18
merged: andrew.bennetts at canonical.com-20070920011908-dup06dzpikk3lf0q
parent: aaron.bentley at utoronto.ca-20070829004549-u1s9khn42jyupch8
parent: pqm at pqm.ubuntu.com-20070919153217-w7hwnvh6v3wg6p8g
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-check-heads
timestamp: Thu 2007-09-20 11:19:08 +1000
message:
Merge latest bzr.dev.
------------------------------------------------------------
revno: 2745.6.17
merged: aaron.bentley at utoronto.ca-20070829004549-u1s9khn42jyupch8
parent: aaron.bentley at utoronto.ca-20070829004227-q89oifuqul7ozbkv
parent: pqm at pqm.ubuntu.com-20070829001914-yd1js1ms7eg7g38g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Tue 2007-08-28 20:45:49 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2745.6.16
merged: aaron.bentley at utoronto.ca-20070829004227-q89oifuqul7ozbkv
parent: aaron.bentley at utoronto.ca-20070826224552-9ilsoakixzcfqcyz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Tue 2007-08-28 20:42:27 -0400
message:
Update from review
------------------------------------------------------------
revno: 2745.6.15
merged: aaron.bentley at utoronto.ca-20070826224552-9ilsoakixzcfqcyz
parent: aaron.bentley at utoronto.ca-20070826224253-5u6uonnti1u1cyrk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Sun 2007-08-26 18:45:52 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 2745.6.14
merged: aaron.bentley at utoronto.ca-20070826224253-5u6uonnti1u1cyrk
parent: aaron.bentley at utoronto.ca-20070826222928-xex3vixfmuto3ule
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Sun 2007-08-26 18:42:53 -0400
message:
Fix an indent
------------------------------------------------------------
revno: 2745.6.13
merged: aaron.bentley at utoronto.ca-20070826222928-xex3vixfmuto3ule
parent: aaron.bentley at utoronto.ca-20070826220453-ea3gt7bwe42bbciy
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Sun 2007-08-26 18:29:28 -0400
message:
Misc cleanup
------------------------------------------------------------
revno: 2745.6.12
merged: aaron.bentley at utoronto.ca-20070826220453-ea3gt7bwe42bbciy
parent: aaron.bentley at utoronto.ca-20070825154727-2gstd0e1odldnlpz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Sun 2007-08-26 18:04:53 -0400
message:
Do topological sorting when adding new records to VersionedFile
------------------------------------------------------------
revno: 2745.6.11
merged: aaron.bentley at utoronto.ca-20070825154727-2gstd0e1odldnlpz
parent: aaron.bentley at utoronto.ca-20070825012247-y663jh7d68e1k8s8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Sat 2007-08-25 11:47:27 -0400
message:
Fix knit file parents to follow parentage from revision/inventory XML
------------------------------------------------------------
revno: 2745.6.10
merged: aaron.bentley at utoronto.ca-20070825012247-y663jh7d68e1k8s8
parent: abentley at panoramicfeedback.com-20070824181550-wg0d0sc5b34jbeb8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Fri 2007-08-24 21:22:47 -0400
message:
Remove obsolete comment
------------------------------------------------------------
revno: 2745.6.9
merged: abentley at panoramicfeedback.com-20070824181550-wg0d0sc5b34jbeb8
parent: abentley at panoramicfeedback.com-20070824180407-v76tehjpr1pn08dm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-graph
timestamp: Fri 2007-08-24 14:15:50 -0400
message:
Document find_bad_ancestors
------------------------------------------------------------
revno: 2745.6.8
merged: abentley at panoramicfeedback.com-20070824180407-v76tehjpr1pn08dm
parent: abentley at panoramicfeedback.com-20070824175422-3v0h742l9bb0u5rd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-graph
timestamp: Fri 2007-08-24 14:04:07 -0400
message:
Clean up text
------------------------------------------------------------
revno: 2745.6.7
merged: abentley at panoramicfeedback.com-20070824175422-3v0h742l9bb0u5rd
parent: abentley at panoramicfeedback.com-20070824164439-9wn238uew9ytuw2o
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-graph
timestamp: Fri 2007-08-24 13:54:22 -0400
message:
Clean-up
------------------------------------------------------------
revno: 2745.6.6
merged: abentley at panoramicfeedback.com-20070824164439-9wn238uew9ytuw2o
parent: abentley at panoramicfeedback.com-20070824164428-y029t1thn5i82pz4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-graph
timestamp: Fri 2007-08-24 12:44:39 -0400
message:
Add unreferenced ancestors to check output
------------------------------------------------------------
revno: 2745.6.5
merged: abentley at panoramicfeedback.com-20070824164428-y029t1thn5i82pz4
parent: abentley at panoramicfeedback.com-20070824145520-aibv8nf8689vuk69
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-graph
timestamp: Fri 2007-08-24 12:44:28 -0400
message:
Ensure references to ghosts behave as expected
------------------------------------------------------------
revno: 2745.6.4
merged: abentley at panoramicfeedback.com-20070824145520-aibv8nf8689vuk69
parent: abentley at panoramicfeedback.com-20070824144026-czbyc9xds7w2qk5j
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-graph
timestamp: Fri 2007-08-24 10:55:20 -0400
message:
Reshuffle results to reduce duplication
------------------------------------------------------------
revno: 2745.6.3
merged: abentley at panoramicfeedback.com-20070824144026-czbyc9xds7w2qk5j
parent: abentley at panoramicfeedback.com-20070824133005-ixsbp0djy26vyyl1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-graph
timestamp: Fri 2007-08-24 10:40:26 -0400
message:
Implement versionedfile checking for bzr check
------------------------------------------------------------
revno: 2745.6.2
merged: abentley at panoramicfeedback.com-20070824133005-ixsbp0djy26vyyl1
parent: aaron.bentley at utoronto.ca-20070824124517-cnyqhp8f6luxjnws
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-graph
timestamp: Fri 2007-08-24 09:30:05 -0400
message:
Handle files not present in revision
------------------------------------------------------------
revno: 2745.6.1
merged: aaron.bentley at utoronto.ca-20070824124517-cnyqhp8f6luxjnws
parent: pqm at pqm.ubuntu.com-20070823005013-ada9x55rc31yiwou
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: check-graph
timestamp: Fri 2007-08-24 08:45:17 -0400
message:
Initial checking of knit graphs
Diff too large for email (1652 lines, the limit is 1000).
More information about the bazaar-commits
mailing list