[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision cabb2dd789d55ae6063f061502612cf28e23
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision cabb2dd789d55ae6063f061502612cf28e230b24 |
Date: |
Thu, 8 Feb 2007 00:05:07 +0100 |
-----------------------------------------------------------------
Revision: cabb2dd789d55ae6063f061502612cf28e230b24
Ancestor: 875f4ccdc92483208affcb47e5b3f1dc50e1d610
Author: address@hidden
Date: 2007-02-07T22:54:01
Branch: net.venge.monotone.workspace-merge.noconflict
Added files:
tests/two_parent_workspace_commands_that_fail/__driver__.lua
tests/two_parent_workspace_pluck/__driver__.lua
Added directories:
tests/two_parent_workspace_commands_that_fail
tests/two_parent_workspace_pluck
Modified files:
ChangeLog cmd_merging.cc testsuite.lua
ChangeLog:
* 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=875f4ccdc92483208affcb47e5b3f1dc50e1d610
--revision=cabb2dd789d55ae6063f061502612cf28e230b24
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision cabb2dd789d55ae6063f061502612cf28e230b24,
monotone <=