Rev 1563: * New 'reconcile' command will check branch consistency
and repair indexes in /home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Fri Mar 3 05:38:18 GMT 2006
------------------------------------------------------------
revno: 1563
revision-id: robertc at robertcollins.net-20060303053804-ef5cbede74123fcc
parent: pqm at pqm.ubuntu.com-20060301231454-30078363321e6050
parent: robertc at robertcollins.net-20060228011301-df7ce3b80dfb37ba
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-03 16:38:04 +1100
message:
* New 'reconcile' command will check branch consistency and repair indexes
that can become out of sync in pre 0.8 formats. (Robert Collins,
Aaron Bentley)
added:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/weave.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
merged: robertc at robertcollins.net-20060228011301-df7ce3b80dfb37ba
parent: robertc at robertcollins.net-20060226075402-92fca9fdb7b0070d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Tue 2006-02-28 12:13:01 +1100
message:
Enforce repository consistency during 'fetch' operations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060226075402-92fca9fdb7b0070d
parent: robertc at robertcollins.net-20060226061907-005121a286a0a419
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sun 2006-02-26 18:54:02 +1100
message:
Check for incorrect revision parentage in the weave during revision access.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060226061907-005121a286a0a419
parent: robertc at robertcollins.net-20060225054854-2f9e99cd1469d8c2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sun 2006-02-26 17:19:07 +1100
message:
Add a FIXME for weave.add and remove some extraneous whitespace.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060225054854-2f9e99cd1469d8c2
parent: robertc at robertcollins.net-20060225005416-e74996bec38de816
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 16:48:54 +1100
message:
Make reconcile work with shared repositories.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060225005416-e74996bec38de816
parent: robertc at robertcollins.net-20060225004918-13fe7b4b532c606c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 11:54:16 +1100
message:
UI tweaks to reconcile - show progress for inventory backup.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060225004918-13fe7b4b532c606c
parent: robertc at robertcollins.net-20060225003259-eafe402b13b8b16e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 11:49:18 +1100
message:
Do not throttle updates to progress bars that change the message.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060225003259-eafe402b13b8b16e
parent: robertc at robertcollins.net-20060224231320-dbaf879d3070bfd7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 11:32:59 +1100
message:
Only reconcile if doing so will perform gc or correct ancestry.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060224231320-dbaf879d3070bfd7
parent: robertc at robertcollins.net-20060224133245-7a448981e53b91f4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 10:13:20 +1100
message:
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060224133245-7a448981e53b91f4
parent: robertc at robertcollins.net-20060224124702-136abce1cffc6ead
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 00:32:45 +1100
message:
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060224124702-136abce1cffc6ead
parent: robertc at robertcollins.net-20060223142448-be912a128be4d590
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Fri 2006-02-24 23:47:02 +1100
message:
Remove unused import in fileid_involved tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060223142448-be912a128be4d590
parent: robertc at robertcollins.net-20060223065213-84cc6d8971363661
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Fri 2006-02-24 01:24:48 +1100
message:
Somewhat optimised version of reconciler.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060223065213-84cc6d8971363661
parent: robertc at robertcollins.net-20060223040856-8b476741783b6244
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Thu 2006-02-23 17:52:13 +1100
message:
Optimise reconcilation to only hit each revision once.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060223040856-8b476741783b6244
parent: robertc at robertcollins.net-20060222233130-dfffba0d31e6a77a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Thu 2006-02-23 15:08:56 +1100
message:
Import bzrtools' 'fix' command as 'bzr reconcile.'
More information about the bazaar-commits
mailing list