[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision ccc72170166d63971e1edc434483ccd14f57
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision ccc72170166d63971e1edc434483ccd14f571cb0 |
Date: |
Thu, 8 Feb 2007 01:05:06 +0100 |
-----------------------------------------------------------------
Revision: ccc72170166d63971e1edc434483ccd14f571cb0
Ancestor: 875f4ccdc92483208affcb47e5b3f1dc50e1d610
Author: address@hidden
Date: 2007-02-07T22:51:26
Branch: net.venge.monotone.workspace-merge.noconflict
Added files:
tests/merge_into_workspace_same_rev/__driver__.lua
Added directories:
tests/merge_into_workspace_same_rev
Modified files:
ChangeLog cmd_merging.cc testsuite.lua
ChangeLog:
2007-02-07 Matthew Gregan <address@hidden>
* cmd_merging.cc (CMD(merge_into_workspace)): N() out if user is
monotone --db={your.database} diff
--revision=875f4ccdc92483208affcb47e5b3f1dc50e1d610
--revision=ccc72170166d63971e1edc434483ccd14f571cb0
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision ccc72170166d63971e1edc434483ccd14f571cb0,
monotone <=