Thomas Keller m...@thomaskeller.biz writes:
Am 02.04.10 10:32, schrieb Stephen Leake:
Here's a plan for moving forward:
1) Modify update so it doesn't call the external merger if
--non-interactive is set (either by the user or by au stdio).
2) Create a new branch
Am 02.04.10 10:32, schrieb Stephen Leake:
Here's a plan for moving forward:
1) Modify update so it doesn't call the external merger if
--non-interactive is set (either by the user or by au stdio).
2) Create a new branch nvm.workspace_conflicts to work on better
methods for resolving
Thomas Keller m...@thomaskeller.biz writes:
Am 01.04.10 04:18, schrieb Stephen Leake:
So 'mtn au stdio' 'l6updatee' with the standard hooks does require
prompting via stdio, if the best available merger is opendiff. So we
(I) have to do something. Sigh.
Really, please don't let it call
Am 01.04.10 04:18, schrieb Stephen Leake:
Thomas Keller m...@thomaskeller.biz writes:
Currently, whether you do a normal or a
workspace merge, as soon as a content conflict arises, mtn opens a
merger process (might it be vim or kdiff3 or emacs or opendiff) and
waits until this process
Thomas Keller m...@thomaskeller.biz writes:
1) How does automate update behaves (especially over stdio) when a
workspace merge has to take place? I don't see any special code handling
that in a sane way.
I just tried 'mtn automate update' and 'mtn automate stdio'
'l6:updatee'; it's the same
Am 31.03.10 13:10, schrieb Stephen Leake:
Thomas Keller m...@thomaskeller.biz writes:
1) How does automate update behaves (especially over stdio) when a
workspace merge has to take place? I don't see any special code handling
that in a sane way.
I just tried 'mtn automate update' and 'mtn
Thomas Keller m...@thomaskeller.biz writes:
Currently, whether you do a normal or a
workspace merge, as soon as a content conflict arises, mtn opens a
merger process (might it be vim or kdiff3 or emacs or opendiff) and
waits until this process ends, i.e. returns, to pick up the saved
Am 28.03.10 18:17, schrieb Stephen Leake:
Stephen Leake stephen_le...@stephe-leake.org writes:
function gds_update_all()
local workspaces = gds_find_workspaces (gds_missions)
for _, ws in pairs(workspaces) do
-- cd(../ .. ws)
-- mtn (update)
Am 31.03.10 00:12, schrieb Stephen Leake:
I added a new Lua function 'change_workspace' (cmd_automate.cc in
f0b5f85a97853d52f94fd3aab2606ba093a40bff), which basically calls
paths.cc go_to_workspace.
[...]
Any comments on 'automate update' or 'change_workspace'?
Looks good in general, a few
Stephen Leake stephen_le...@stephe-leake.org writes:
...
This basically works, but I'm getting errors about writing the options file:
mtn: warning: Failed to write options file _MTN/options: error: renaming
'_MTN/mtdkyfvx.tmp' to '_MTN/options' failed: Access is denied. (5)
I found the
Stephen Leake stephen_le...@stephe-leake.org writes:
function gds_update_all()
local workspaces = gds_find_workspaces (gds_missions)
for _, ws in pairs(workspaces) do
-- cd(../ .. ws)
-- mtn (update)
mtn_automate (update, --workspace= ..
11 matches
Mail list logo
