diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-08-24 01:44:29 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-08-24 01:44:29 +0000 |
| commit | 38550f06408b1c05369e6bf130a2bc933e0ed57a (patch) | |
| tree | b37ee33cabea72847cca7d1cb24c4f4cfc3c4957 /doc/rcs/monotone.mdwn | |
| parent | dbacba6612a3aa632b26e084a860cc5e378881ff (diff) | |
| download | ikiwiki-38550f06408b1c05369e6bf130a2bc933e0ed57a.tar ikiwiki-38550f06408b1c05369e6bf130a2bc933e0ed57a.tar.gz | |
web commit by http://willu.myopenid.com/: Tested monotone plugin with renames - Ikiwiki catches this case itself, so remove the caveat here.
Diffstat (limited to 'doc/rcs/monotone.mdwn')
| -rw-r--r-- | doc/rcs/monotone.mdwn | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn index 4711b6f4d..d79381571 100644 --- a/doc/rcs/monotone.mdwn +++ b/doc/rcs/monotone.mdwn @@ -12,6 +12,5 @@ Monotone support works, but there are still a few minor missing bits (listed her * At the moment there are no links to display diffs between revisions. It shouldn't be hard to add links to a [ViewMTN](http://grahame.angrygoats.net/moinmoin/ViewMTN) instance, but it hasn't been done yet. * The [[post-commit]] hook support, so that Ikiwiki sends change notifications when people commit using Monotone rather than the web interface, is partially implemented and untested. * Documentation (this page) could be improved. -* If you have both a conflict and a simultaneous rename on a file, then Ikiwiki may get confused. There is also a mismatch between the way Ikiwiki handles conflicts and the way Monotone handles conflicts. At present, if there is a conflict, then Ikiwiki will commit a revision with conflict markers before presenting it to the user. This is ugly, but there is no clean way to fix it at present. |