[Monotone-commits-diffs] Revision 50767bcca4a3c0c1dbb8379d14ec3c8560c16239

[monotone]

-----------------------------------------------------------------
Revision: 50767bcca4a3c0c1dbb8379d14ec3c8560c16239
Ancestor: bf4124367ab8ad3367548730be509e885511f2a9
Author: address@hidden
Date: 2007-02-10T02:28:48
Branch: net.venge.monotone.workspace-merge.noconflict

Modified files:
        ChangeLog automate.cc cmd_diff_log.cc cmd_merging.cc
        database.hh work.cc work.hh

ChangeLog: 

        * work.cc (get_revision_id, get_base_revision, get_base_roster)
        (get_base_and_current_roster_shape): Delete delete delete.
        * work.hh: Likewise.  Improve comments.
        * database.hh (parent_cached_roster): New wrappers for parent_entries.
        * automate.cc (attributes, get_base_revision_id)
        * cmd_diff_log.cc (prepare_diff)
        * cmd_merging.cc (update, merge_into_workspace)
        Use parent_id/parent_roster/parent_cached_roster wrappers instead
        of direct access to pair ->first and ->second.

txt0E4G8YGEND.txt
Description: Diff [bf4124367ab8ad3367548730be509e885511f2a9] -> [50767bcca4a3c0c1dbb8379d14ec3c8560c16239]