Branches that are marked Stalled:
Contact: StephenLeake
The branch name is misleading; the automate_show_conflicts branch is now about implementing file sutures.
The original work on conflict resolution moved to nvm.resolve_conflicts, which has landed.
Strategy: Support file sutures, to provide true resolution of duplicate name conflicts by recording both parents.
Status: Stalled Abandoned August 2008; way too much work for very little gain.
[[!comment there is no local copy of Botan anymore; is this branch needed?]] Contact: MarkusWanner
Adds a --with-system-botan configure switch, to allow using the system provided copy of botan. Especially note, that the system provided library most probably features the assembler optimizations for SHA1, where as the bundled botan currently does not.
Status: Stalled
Contact: RichardLevitte
This branch implements the command mtn branch and consequently,
removes the -b option from mtn commit.
mtn branch fiddles with _MTN/options, adding a new option called
newbranch, which mtn commit picks up at commit time.
Info from the old wiki:
Contact: ThomasKeller
An attempt to remove the --branch option from "mtn commit" and replace the functionality by a new "mtn branch" command which explicitely sets the branch stanza in _MTN/options. This basically works, but is not thoroughly thought through for now, basically because we loose the old branch information after "mtn branch", so subsequent commands like "mtn update" which still rely on the old_revision and the recorded branch name fail badly unless the workspace is committed again. So, what still needs to be done is
- if mtn branch is triggered on an unmodified workspace, mtn commit should succeed and just add the new branch cert to old_revision
- if the branch is switched, the new branch name should be recorded as "new_branch" while keeping "branch" untouched unless commit happens, so "mtn update" and friends work properly
- mtn revert should remove any "new_branch" stanza from _MTN/options
- eventually "mtn branch" should be renamed to "mtn switch" and get some more functionality (i.e. if switched to a named, existing branch, update the workspace to the head of this branch)
Status: Stalled, decide what to do with all that.
Contact: ThomasKeller
An attempt to bring warnings and informal messages properly encoded into automate stdio.
Status: Stalled Doesn't compile, not even alpha state. Hope to find some time for this on the next summit.
Contact: StephenLeake
mtn sync file: and mtn sync ssh: do not work reliably on Windows MinGW.
The core problem is that Win32 does not support select on pipes.
This branch attempts to replace Win32 pipes by sockets.
It fails, because ssh doesn't create sockets when it runs mtn.
See comments in netxx_pipe.hh
See nvm.experimental.win32 pipes 2 for another approach.
Status: Stalled; use Cygwin instead, where things just work.
Contact: StephenLeake
Second attempt to fix mtn sync file: and mtn sync ssh: on Windows MinGW.
See nvm.experimental.win32 pipes for another approach.
This branch attempts to fix the named pipe solution that is in the main branch.
See comments in netxx_pipe.hh
Status: Stalled no actual work beyond planning done.
Contact: ?PetrBaudis
Adds two-way syncing with git repositories (unix only).
Status: I'm not quite sure. Petr? (ms) hasn't been touched for awhile, Stalled.
Contact: MarkusWanner, DerekScherger
The goal of the nuskool branch is to replace netsync with a faster, DAG based algorithm.
Status: Stalled
Contact: ThomasKeller
Replaces automate content_diff by a generic automate diff command
which outputs the complete changeset (including node adds, drops,
renames and attribute changes) in an generic basic_io format. The
actual diff is included in a data stanza in unified diff format.
There hasn't yet been
an consensus if this should really be the "official" format mtn should
use to express external changesets - primarily because once this is
set into stone we certainly want an automate apply_diff command to
complement this functionality. We also still have to find a way to
express binary deltas within this new format to make it really useful
for the apply_diff use case.
Status: Stalled for quite a long time, as above