[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision fced5ed367b49a3ba7a6c2ec388892d0e0e4
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision fced5ed367b49a3ba7a6c2ec388892d0e0e48d74 |
Date: |
Thu, 8 Feb 2007 02:05:17 +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.
monotone --db={your.database} diff
--revision=be6d1b107f9ecc54e5c2bfafe2886aa8844aa0f8
--revision=fced5ed367b49a3ba7a6c2ec388892d0e0e48d74
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision fced5ed367b49a3ba7a6c2ec388892d0e0e48d74,
monotone <=