[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision feb303ed0811833626f532c189e79ca1324c
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision feb303ed0811833626f532c189e79ca1324cf45a |
Date: |
Tue, 1 Dec 2009 06:26:13 +0100 |
-----------------------------------------------------------------
Revision: feb303ed0811833626f532c189e79ca1324cf45a
Ancestor: 88fdeb39697e1d44f420f850a594b96e98d3981e
Author: address@hidden
Date: 2009-12-01T05:21:01
Branch: net.venge.monotone.bisect
Added files:
tests/bisect_blocked/__driver__.lua
Added directories:
tests/bisect_blocked
Modified files:
cmd_ws_commit.cc work.cc work.hh
ChangeLog:
handle various bisect updates that are blocked by unversioned files
* cmd_ws_commit.cc (bisect_select, bisect::type::operator<<): add case for
bisect::update type
(bisect_update): wrap some long lines; don't change bisection info in bisect
update command; pass --move-conflicting-paths option to perform_content_update
(CMD bisect_status): add warnings when the workspace is not at the selected
bisection revision
(CMD bisect_update): new command to update the workspace to the selected
bisection revision based on existing bisection information; the bisect_ prefix
on this function exists because the command registration machinery doesn't
like two command handlers called 'update'
(CMD skip, bad, good): add bisect_ prefix to command functions for consistency
with bisect_update command; allow --move-conflicting-paths option in all
updating bisect subcommands
* work.{cc,hh} (put_bisect_info): add case for bisect::update type; add
bisect::update to type enum
* tests/bisect_blocked/__driver__.lua: new test for bisect updates blocked by
unversioned files
monotone --db={your.database} diff
--revision=88fdeb39697e1d44f420f850a594b96e98d3981e
--revision=feb303ed0811833626f532c189e79ca1324cf45a
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision feb303ed0811833626f532c189e79ca1324cf45a,
monotone <=