[Monotone-commits-diffs] Revision 4ac5f3b81a216a59f8c0a739176bebd6023a379e

[monotone]

-----------------------------------------------------------------
Revision: 4ac5f3b81a216a59f8c0a739176bebd6023a379e
Ancestor: 2b4e56cfd86174b3da6b4a9ae93b579a8df3f1ce
Author: address@hidden
Date: 2007-02-11T02:08:03
Branch: net.venge.monotone.workspace-merge.noconflict

Modified files:
        cmd_list.cc cmd_ws_commit.cc revision.cc revision.hh
        tests/two_parent_workspace_commands_that_fail/__driver__.lua

ChangeLog: 

        * revision.cc (recalculate_manifest_id_for_restricted_rev): New,
        broken out of make_restricted_revision.
        (make_restricted_revision): Split into two functions, one for the
        'don't care about the exclusions' case (ls changed, status) and
        one for the 'there can be exclusions but only if there's only one
        parent' case (commit).
        * revision.hh: Update to match.  Remove #if 0 block.
        * cmd_list.cc (ls_changed): Remove 'dummy' argument to
        make_restricted_revision.
        * cmd_ws_commit.cc (status): Likewise.
        (commit): Pass command name to make_restricted_revision too.

txtUYtAK1udr9.txt
Description: Diff [2b4e56cfd86174b3da6b4a9ae93b579a8df3f1ce] -> [4ac5f3b81a216a59f8c0a739176bebd6023a379e]