#
#
# patch "index.html"
# from [7fc946dec119eae6388afa0e780db35078062360]
# to [5ef6d67a5ebfe14789bf1f563cadbad7e682b5d6]
#
# patch "wiki/Feature/WebInterface.mdwn"
# from [c2bd3a28f76e4b62f5a45dac5ed9c587ace988b4]
# to [1e0c290ec675451b2910b1c85ff82614f5e391f1]
#
# patch "wiki/InterfacesFrontendsAndTools.mdwn"
# from [42089f21086c6b1fe2a383997de6506fc4dbb618]
# to [a79f2a9491b50d4a6af9c173258116052374f196]
#
# patch "wiki/SummerOfCode/2006.mdwn"
# from [8f8e2710cde42c475b9ed00e7ec1b169bed0cf9e]
# to [e564dd5efffd1983b2e5d924875b8ce7a665280a]
#
# patch "wiki/WishList.mdwn"
# from [a30d547ba5925639d727c23d4004c45c546edd29]
# to [0a87e938d782485de984b54946640b2adb12c605]
#
============================================================
--- index.html 7fc946dec119eae6388afa0e780db35078062360
+++ index.html 5ef6d67a5ebfe14789bf1f563cadbad7e682b5d6
@@ -102,7 +102,7 @@
IRC (logs)
nightly documentation build (one page)
self-hosting info
- browse source
+ browse source
latest work (RSS)
commit mailing list:
with /
============================================================
--- wiki/Feature/WebInterface.mdwn c2bd3a28f76e4b62f5a45dac5ed9c587ace988b4
+++ wiki/Feature/WebInterface.mdwn 1e0c290ec675451b2910b1c85ff82614f5e391f1
@@ -12,8 +12,8 @@ There are a number of [[InterfacesFronte
# Example Usage
- * [Recent monotone activity, via [ViewMTN]](http://viewmtn.angrygoats.net/all/branch/changes/net.venge.monotone)
- * [Current monotone HEAD revision](http://viewmtn.angrygoats.net/all/branch/changes/net.venge.monotone)
+ * [Recent monotone activity, via [ViewMTN]](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone)
+ * [Current monotone HEAD revision](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone)
* [Trac-monotone demonstration](http://tracmtn.1erlei.de/browser)
* [Recent monotone activity, via CIA](http://cia.navi.cx/stats/project/monotone)
============================================================
--- wiki/InterfacesFrontendsAndTools.mdwn 42089f21086c6b1fe2a383997de6506fc4dbb618
+++ wiki/InterfacesFrontendsAndTools.mdwn a79f2a9491b50d4a6af9c173258116052374f196
@@ -9,23 +9,23 @@
* **[monotone-viz](http://oandrieu.nerim.net/monotone-viz/)** : [GTK+](http://gtk.org) app for browsing and visualizing history
* **Emacs** integration:
- * **monotone.el**: In `contrib/` directory of monotone's source tree. [Latest version](http://viewmtn.angrygoats.net/branch/head/file/net.venge.monotone/contrib/monotone.el) (via viewmtn).
+ * **monotone.el**: In `contrib/` directory of monotone's source tree. [Latest version](http://mtn-view.1erlei.de/branch/head/file/net.venge.monotone/contrib/monotone.el) (via viewmtn).
* **[DVC](http://download.gna.org/dvc/)** (see also [DVC](http://gna.org/projects/dvc)) is a project to create a generic library for fancy Emacs interfaces to modern version control systems. DVC includes monotone support.
* **[ViewMTN](http://grahame.angrygoats.net/viewmtn.shtml)**: a web interface to a monotone repository.
- * **[TracMonotone](http://tracmtn.1erlei.de/)**: A version control system plugin for **[Trac](http://trac.edgewall.com)** a popular integrated history browser/wiki/bug tracker. Latest [stable](http://viewmtn.angrygoats.net/all/branch/changes/net.venge.monotone.trac-plugin)/[development](http://viewmtn.angrygoats.net/all/branch/changes/net.venge.monotone.trac-plugin.twisted) version.
- * **[guitone](http://guitone.thomaskeller.biz)**: A Qt-based, cross-platform frontend for monotone. [Latest version](http://viewmtn.angrygoats.net/branch/head/browse/net.venge.monotone.guitone) (via viewmtn).
- * **[mtn-browse](http://www.coosoft.plus.com/software.html)**: A Perl/Gtk2 based graphical database browser for Monotone (requires no workspace). State: Beta (stable). [Latest development version](http://viewmtn.angrygoats.net/all/branch/changes/net.venge.monotone.contrib.mtn-browse) (via viewmtn).
+ * **[TracMonotone](http://tracmtn.1erlei.de/)**: A version control system plugin for **[Trac](http://trac.edgewall.com)** a popular integrated history browser/wiki/bug tracker. Latest [stable](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.trac-plugin)/[development](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.trac-plugin.twisted) version.
+ * **[guitone](http://guitone.thomaskeller.biz)**: A Qt-based, cross-platform frontend for monotone. [Latest version](http://mtn-view.1erlei.de/branch/head/browse/net.venge.monotone.guitone) (via viewmtn).
+ * **[mtn-browse](http://www.coosoft.plus.com/software.html)**: A Perl/Gtk2 based graphical database browser for Monotone (requires no workspace). State: Beta (stable). [Latest development version](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.contrib.mtn-browse) (via viewmtn).
* **[mtsh](http://mtn-host.prjek.net/projects/mtsh/)**: GTK+ wrapper for monotone focusing on working copy operations -- add, drop, revert, rename, commit, update, diff, and browsing. Has a mechanism for per-file commit comments. *(This is a bit old and very much unmaintained.)*
* **Usher**: A server manager that can be used to serve several projects on the same IP/port, starting and stopping servers as needed. In branch `net.venge.monotone.contrib.usher`.
* **[meld](http://meld.sf.net)**: a general diff, merge, and history browsing tool written in [Python](http://python.org) for [Gnome](http://gnome.org). Has monotone support since 1.1.3.
- * **shell completion**: monotone ships with completion scripts for both bash and zsh, in the `contrib/` directory of monotone's source tree. Latest versions for [bash](http://viewmtn.angrygoats.net/branch/head/file/net.venge.monotone/contrib/monotone.bash_completion) and [zsh](http://viewmtn.angrygoats.net/branch/head/file/net.venge.monotone/contrib/monotone.zsh_completion) (via viewmtn).
- * "**dumb server**" support, for publishing repositories via ordinary ftp/http/sftp/local filesystem: in branch [net.venge.monotone.dumb](http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone.dumb).
+ * **shell completion**: monotone ships with completion scripts for both bash and zsh, in the `contrib/` directory of monotone's source tree. Latest versions for [bash](http://mtn-view.1erlei.de/branch/head/file/net.venge.monotone/contrib/monotone.bash_completion) and [zsh](http://mtn-view.1erlei.de/branch/head/file/net.venge.monotone/contrib/monotone.zsh_completion) (via viewmtn).
+ * "**dumb server**" support, for publishing repositories via ordinary ftp/http/sftp/local filesystem: in branch [net.venge.monotone.dumb](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.dumb).
* **[m7](http://www.midwinter.com/~lch/programming/m7/)**: Experimental drop-in command-line wrapper for monotone. Adds simple local version numbers (no longer using certs) and an enhanced annotate front-end.
* **monotree**: Java app for browsing and visualizing history; more portable than monotone-viz. In branch `net.venge.monotone.contrib.monotree`.
* **[RSCM::Monotone](http://rscm.rubyforge.org/classes/RSCM/Monotone.html)**: a [Ruby](http://www.ruby-lang.org/) interface to monotone.
- * **[Monotone::AutomateStdio](http://www.coosoft.plus.com/software.html)**: A Perl library for interfacing with Monotone via its automate stdio interface. State: Stable. [Latest development version](http://viewmtn.angrygoats.net/all/branch/changes/net.venge.monotone.contrib.lib.automate-stdio) (via viewmtn).
- * **monotone-notify.pl**: A script to watch a monotone repository and, for example, send emails on commits. In `contrib/` directory of monotone's source tree. [Latest version](http://viewmtn.angrygoats.net/branch/head/file/net.venge.monotone/contrib/monotone-notify.pl) (via viewmtn).
- * **ciabot_monotone.py**: A notification script for [CIA](http://cia.navi.cx). In `contrib/` directory of monotone's source tree. [Latest version](http://viewmtn.angrygoats.net/branch/head/file/net.venge.monotone/contrib/ciabot_monotone.py) (via viewmtn).
+ * **[Monotone::AutomateStdio](http://www.coosoft.plus.com/software.html)**: A Perl library for interfacing with Monotone via its automate stdio interface. State: Stable. [Latest development version](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.contrib.lib.automate-stdio) (via viewmtn).
+ * **monotone-notify.pl**: A script to watch a monotone repository and, for example, send emails on commits. In `contrib/` directory of monotone's source tree. [Latest version](http://mtn-view.1erlei.de/branch/head/file/net.venge.monotone/contrib/monotone-notify.pl) (via viewmtn).
+ * **ciabot_monotone.py**: A notification script for [CIA](http://cia.navi.cx). In `contrib/` directory of monotone's source tree. [Latest version](http://mtn-view.1erlei.de/branch/head/file/net.venge.monotone/contrib/ciabot_monotone.py) (via viewmtn).
* Script for **importing maildir-format mailboxes** to monotone, for offline reading and syncing: [on the list](http://lists.gnu.org/archive/html/monotone-devel/2005-09/msg00234.html).
* **[Wireshark](http://www.wireshark.org)**: a fantastic network traffic analyzer, that has support for decoding monotone's 'netsync' protocol.
* **[Apso](http://aleph0.info/apso/)**: A system for encrypting version control system repositories/databases (currently a prototype; the first version control system supported is Monotone).
@@ -44,7 +44,7 @@
* **[PIDA](http://pida.berlios.de/)**: Integrated development environment supporting Monotone (among others)
* **[Eclipse](http://eclipse.org)**: Well known, extremely pluggable IDE, with plugins e.g. for [Darcs](http://eclipsedarcs.org/doku.php) or [other VCs](http://www.eclipse.org/community/team.php).
- Development of a Monotone plugin called `MTTeam` has begun. There doesn't seem to be a webpage yet, but a [mailinglist](http://mail.siliconcircus.com/mailman/listinfo/mtteam-devel).
+ Development of a Monotone plugin called `MTTeam` has begun. There doesn't seem to be a webpage yet, but a [mailinglist](http://mail.siliconcircus.com/mailman/listinfo/mtteam-devel).
## merge tools
@@ -76,7 +76,7 @@ out of the box.
* tools to manage code reviews, integration workflows, and such things
* one possibly relevant thing: vim plugin for doing code reviews:
* "Tortoise Monotone" -- a windows interface to monotone, integrated with the file explorer. This approach works *very* well for subversion...
- * the work on TortoiseMtn has been [started on the last summit](http://viewmtn.angrygoats.net/branch/head/browse/net.venge.monotone.tortoise) - based on [TortoiseHg](http://tortoisehg.sf.net) and [guitone](http://guitone.thomaskeller.biz)
+ * the work on TortoiseMtn has been [started on the last summit](http://mtn-view.1erlei.de/branch/head/browse/net.venge.monotone.tortoise) - based on [TortoiseHg](http://tortoisehg.sf.net) and [guitone](http://guitone.thomaskeller.biz)
* `mtnpatch`, a small, standalone, slightly smarter version/wrapper of `patch(1)` that understands and can apply the additional cset operations (eg, `drop` and `rename`) listed in `mtn diff` comments. Useful for end-users tracking monotone sources without actually using monotone or a db. Bonus points for a `mtnfollow` that combines this patch tool with a web client to fetch diffs as needed from ViewMTN, and keeps a `_MTN` directory up to date so its easy for a user to switch to using full monotone once they need it (eg, for local changes).
* A Visual Studio plugin for Monotone.
* *your wished-for tool here*
============================================================
--- wiki/SummerOfCode/2006.mdwn 8f8e2710cde42c475b9ed00e7ec1b169bed0cf9e
+++ wiki/SummerOfCode/2006.mdwn e564dd5efffd1983b2e5d924875b8ce7a665280a
@@ -86,7 +86,7 @@ Here are some example ideas for projects
* Add the ability to spawn a process and speak netsync to it (a kind of generalized proxy support).
Use this to teach monotone to run netsync over jabber/jingle, etc.
* clarification wanted: what about this? there's a branch that wants to provide an stdin/stdout interface to monotone. is reviving that and finishing it part of this, or something else?
- * Answer: Yes, this is a generalization of the .ssh branch. Basically, the idea would be to make it possible to say `mtn sync --connect-via 'ssh foo.com mtn serve-stdio'`, where the argument to --connect-via is an arbitrary command. This would allow people to add interesting new transports. (The UI given here probably isn't optimal, that's just to give the idea.)
+ * Answer: Yes, this is a generalization of the .ssh branch. Basically, the idea would be to make it possible to say `mtn sync --connect-via 'ssh foo.com mtn serve-stdio'`, where the argument to --connect-via is an arbitrary command. This would allow people to add interesting new transports. (The UI given here probably isn't optimal, that's just to give the idea.)
* Our test coverage has been hovering at about 90% for a long time: [current status](http://frances.vorpus.org/~monotone-cov/net.venge.monotone/).
Get it higher than that!
* Support for "nested trees" -- Some way to combine several projects that are versioned separately into a single workspace, similar to CVS modules, or Arch "configs". There are a fair number of people interested in this, but no design yet; part of the project would be figuring out what exactly everyone wants from this capability.
@@ -102,7 +102,7 @@ people use. Examples:
wiki/bug tracker/source code browser, and it supports plugins for
different VCSes. We need a monotone plug-in! Probably the thing to
start from is the [mercurial plugin](http://projects.edgewall.com/trac/wiki/TracMercurial). (python)
- * Development of a trac plugin has already been started, see the [trac-plugin branch](http://viewmtn.angrygoats.net/branch.psp?branch=net.venge.monotone.trac-plugin).
+ * Development of a trac plugin has already been started, see the [trac-plugin branch](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.trac-plugin).
* We could use a good general, cross-platform (so probably Qt) GUI for history browsing and
general modification. "guitone" is a possible start at this, in the monotone repository.
* [Eclipse](http://eclipse.org) and [NetBeans](http://www.netbeans.org) are two great Java IDEs.
============================================================
--- wiki/WishList.mdwn a30d547ba5925639d727c23d4004c45c546edd29
+++ wiki/WishList.mdwn 0a87e938d782485de984b54946640b2adb12c605
@@ -33,7 +33,7 @@ Monotone could use a subcommand such as
Monotone could use a subcommand such as "newbranch", with the only purpose to change _MTN/options with the name of the new branch.
-The ability to mark branches as "unused". i.e. abandonded or merged. If you go to the main monotone [viewmtn](http://viewmtn.angrygoats.net/) web page you see 165 branches with 'monotone' in the name. I suspect that a number of those have been merged and/or abandoned. It would be nice to know which.
+The ability to mark branches as "unused". i.e. abandonded or merged. If you go to the main monotone [viewmtn](http://mtn-view.1erlei.de/) web page you see 165 branches with 'monotone' in the name. I suspect that a number of those have been merged and/or abandoned. It would be nice to know which.
It would be good if there were a convention that branches of the monotone repository had a readme.branchname file describing the branch.