summaryrefslogtreecommitdiff
path: root/doc/patchqueue
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-14 08:16:09 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-14 08:16:09 +0000
commitc87c7edf288ca69e96721ed6ff46f12b7f478540 (patch)
treefb5a833c74ba5badda173e79ca018ba449d03676 /doc/patchqueue
parent559344048cfd0adcd81e3f1dff76b9a13b89d9c1 (diff)
web commit by http://ethan.betacantrips.com/
Diffstat (limited to 'doc/patchqueue')
-rw-r--r--doc/patchqueue/move_page.mdwn15
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/patchqueue/move_page.mdwn b/doc/patchqueue/move_page.mdwn
index e3109f062..fcf416a4a 100644
--- a/doc/patchqueue/move_page.mdwn
+++ b/doc/patchqueue/move_page.mdwn
@@ -26,6 +26,21 @@ Anyhow, here's the patch, for whatever good it does.
> implement a move operation -- falling back to an add and delete.
> --[[Joey]]
+Hmm. Shouldn't that be done on a by-RCS basis, though? (i.e. implemented
+by backends in the `rcs_move` function)
+
+Also, how should ikiwiki react if a page is edited (say, by another user)
+before it is moved? Bail, or shrug and proceed?
+
+Could you elaborate on [[commit-internals]]? Can I assume that ikiwiki's
+working copy W will always reflect a revision of the master copy M?
+(That is, nobody changes W and leaves it uncommitted.) I would guess
+probably not; a user probably expects that if he starts editing W it
+won't get randomly committed by web user actions. But then looking at
+the svn backend, it looks like if I edit foo.mdwn, don't commit, and then
+a web user makes different changes, my changes get wiped out. So does
+W "belong" to ikiwiki? --Ethan
+
diff -urx .svn ikiwiki/IkiWiki/CGI.pm ikiwiki-new/IkiWiki/CGI.pm
--- ikiwiki/IkiWiki/CGI.pm 2007-01-04 03:52:47.000000000 -0800