[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 74d0181554ffa54ba78e22ec2a4b1f57a42c
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 74d0181554ffa54ba78e22ec2a4b1f57a42c6c60 |
Date: |
Fri, 9 Feb 2007 09:05:04 +0100 |
-----------------------------------------------------------------
Revision: 74d0181554ffa54ba78e22ec2a4b1f57a42c6c60
Ancestor: 9733d258ff42f31e745b7a3dcd20bb763aa5b820
Author: address@hidden
Date: 2007-02-09T07:57:57
Branch: net.venge.monotone
Modified files:
ChangeLog cmd_merging.cc diff_patch.cc diff_patch.hh work.cc
ChangeLog:
2007-02-08 Derek Scherger <address@hidden>
* cmd_merging.cc (get_content_paths): new function
(update):
(pluck): put paths by content hash into workspace adapter
* diff_patch.{cc,hh} (content_merge_adaptor::get_version): remove
path argument from interface
(content_merge_workspace_adaptor): add map of paths by content
hash to workspace adaptor
(content_merge_workspace_adaptor::get_version): get path from map
* work.cc (attr_file_name): remove unused var
(editable_working_tree::written_content): remove
(content_merge_empty_adaptor::get_version): remove path argument
(editable_working_tree::create_file_node): write file content here
rather than deferring it to attach_node
(editable_working_tree::attach_node): remove deferred file content
(editable_working_tree::apply_delta): remove path argument from
get_version call
monotone --db={your.database} diff
--revision=9733d258ff42f31e745b7a3dcd20bb763aa5b820
--revision=74d0181554ffa54ba78e22ec2a4b1f57a42c6c60
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 74d0181554ffa54ba78e22ec2a4b1f57a42c6c60,
monotone <=