Changes 0 to 10 on this branch are displayed below, sorted in descending chronological order.

3869 days ago: merge of 2b82c3cea19e7a8e87f9c5a7d8b7bc4efb7acb50
revision info | browse files | diff, diff
Author: mtn-dev@zackw.users.panix.com
Changelog: merge of 2b82c3cea19e7a8e87f9c5a7d8b7bc4efb7acb50
and bcee7b2ed536942ba829f2f08c04b15a7ece73bd
Date: Tue, 25 Jul 2006 08:11:49 GMT
3869 days ago: cmd_merging.cc (CMD(update)): Put the initial calculation of
revision info | browse files | diff
Author: mtn-dev@zackw.users.panix.com
Changelog: * cmd_merging.cc (CMD(update)): Put the initial calculation of
working roster and marking_map back the way it was, except for
using get_work_rev.
Date: Tue, 25 Jul 2006 08:11:39 GMT
3871 days ago: merge of a18986019a85ec38c573d9ee88dae73fb5b2ab6f
revision info | browse files | diff, diff
Author: mtn-dev@zackw.users.panix.com
Changelog: merge of a18986019a85ec38c573d9ee88dae73fb5b2ab6f
and bbff2f8b8e8f988575c65014a76b04ddceb82688
Date: Sat, 22 Jul 2006 21:03:47 GMT
3871 days ago: cmd_ws_commit.cc: Fix merge borkage.
revision info | browse files | diff
Author: mtn-dev@zackw.users.panix.com
Changelog: * cmd_ws_commit.cc: Fix merge borkage.
Date: Sat, 22 Jul 2006 21:03:40 GMT
3875 days ago: propagate from branch 'net.venge.monotone' (head d51ee38d33e87702c503331f5366f9341f2457a4)
revision info | browse files | diff, diff
Author: mtn-dev@zackw.users.panix.com
Changelog: propagate from branch 'net.venge.monotone' (head d51ee38d33e87702c503331f5366f9341f2457a4)
to branch 'net.venge.monotone.workspace-merge.api' (head 194f6c3b2bb362553f41635cc30c5c92b53c1dd0)
Date: Wed, 19 Jul 2006 02:19:00 GMT
3875 days ago: propagate from branch 'net.venge.monotone' (head 98db0d2a2e12c8255c591994d1ea9c6e947793be)
revision info | browse files | diff, diff
Author: mtn-dev@zackw.users.panix.com
Changelog: propagate from branch 'net.venge.monotone' (head 98db0d2a2e12c8255c591994d1ea9c6e947793be)
to branch 'net.venge.monotone.workspace-merge.api' (head ca0e87f5aa94378df6e221f06dce5c5058683873)
Date: Wed, 19 Jul 2006 01:10:21 GMT
3875 days ago: 2006-07-18 Zack Weinberg <zackw@panix.com>
revision info | browse files | diff
Author: mtn-dev@zackw.users.panix.com
Changelog: 2006-07-18 Zack Weinberg <zackw@panix.com>
Revision in _MTN/workrev, not cset in _MTN/work.
Not finished - still many test failures.
* work.cc: Consolidate all file-scope string constants at top of
file; make them all static const.
(get_work_rev, put_work_rev, get_roster_for_rid)
(get_base_and_new_rosters_for_rev): New functions.
(get_work_path, get_work_cset, put_work_cset, remove_work_cset)
(get_revision_path, put_revision_id): Delete.
(get_revision_id, get_base_roster, get_current_roster_shape)
(get_base_and_current_roster_shape): Rewrite in terms of new functions.
(perform_additions, perform_deletions, perform_rename)
(perform_pivot_root): Update to new interfaces.
(dump<shared_ptr<T>>): New partial specialization.
* work.hh: Update prototypes and commentary.
* revision.cc (make_revision): Add some MMs; call check_sane at
end. Reorder operations so that all input data is read before
the output argument is modified.
(print_insane_revision): New function.
(print_revision, write_insane_revision): Use it.
* transforms.cc (fake_id): New function.
* vocab.hh: Prototype fake_id and define wrapper macro.
* cmd_merging.cc (CMD(update), CMD(pluck))
* cmd_ws_commit.cc (CMD(revert), CMD(checkout), CMD(attr))
(CMD(commit), CMD(setup)
Update to new work.cc interfaces.
* tests: Update all tests that look at _MTN/work or _MTN/revision.
* testsuite.lua (base_revision): Likewise.
* NEWS: Mention non-backward-compatible change to workspaces.
* monotone.texi: Update all references to _MTN/work or _MTN/revision.
Date: Wed, 19 Jul 2006 00:45:11 GMT
3879 days ago: work.cc (get_base_revision): Delete both overloads; collapse into...
revision info | browse files | diff
Author: mtn-dev@zackw.users.panix.com
Changelog: * work.cc (get_base_revision): Delete both overloads; collapse into...
(get_base_roster): ...here. Make static.
* work.hh: Delete prototypes for get_base_revision, get_base_roster.
Date: Fri, 14 Jul 2006 23:59:49 GMT
(no earlier changes) recent changes (no later changes)