monotone-commits-diffs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision fced5ed367b49a3ba7a6c2ec388892d0e0e48d

From: monotone
Subject: [Monotone-commits-diffs] Revision fced5ed367b49a3ba7a6c2ec388892d0e0e48d74
Date: Thu, 8 Feb 2007 02:05:16 +0100 
-----------------------------------------------------------------
Revision: fced5ed367b49a3ba7a6c2ec388892d0e0e48d74
Ancestor: be6d1b107f9ecc54e5c2bfafe2886aa8844aa0f8
Author: address@hidden
Date: 2007-02-07T23:52:49
Branch: net.venge.monotone.workspace-merge.noconflict

Modified files:
        ChangeLog cmd_merging.cc cmd_ws_commit.cc
        tests/two_parent_workspace_commands_that_fail/__driver__.lua

ChangeLog: 

        * cmd_diff_log.cc (prepare_diff): Handle multi-parent workspaces
        gracefully.
        * cmd_merging.cc (update): Likewise.
        * cmd_ws_commit.cc (revert): Likewise.
        * tests/two_parent_workspace_commands_that_fail
        * tests/two_parent_workspace_pluck: New tests (expected to fail).
        * testsuite.lua: Add them.
        * cmd_merging.cc (merge_into_workspace): Standardize a diagnostic.

Attachment: txthL7x9qmViW.txt
Description: Diff [be6d1b107f9ecc54e5c2bfafe2886aa8844aa0f8] -> [fced5ed367b49a3ba7a6c2ec388892d0e0e48d74]

reply via email to
[Prev in Thread] Current Thread [Next in Thread]