convert rcs_revert to only stage the reversion

[ikiwiki.git] / doc / todo / web_reversion.mdwn

diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn
index 900d98591a17037ba0881f768207e858c936e805..784b72e0550b66378492da8923b0cee1908b2590 100644 (file)
--- a/doc/todo/web_reversion.mdwn
+++ b/doc/todo/web_reversion.mdwn
@@ -55,7 +55,6 @@ Peter Gammie has done an initial implementation of the above.
 > (The data from `rcs_preprevert` could also be used for a confirmation
 > prompt -- it doesn't currently include enough info for diffs, but at
 > least could have a list of changed files.)
->> I added `rcs_showpatch` which simply yields the output of `git show <patch-id>`. -- [[peteg]]
 >
 > Note that it's possible for a git repo to have commits that modify wiki
 > files in a subdir, and code files elsewhere. `rcs_preprevert` should
@@ -67,17 +66,11 @@ Peter Gammie has done an initial implementation of the above.
 >> Please look it over and tell me what else needs fixing... -- [[peteg]]
 
 >>> I have made my own revert branch and put a few fixes in there
+>>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]]
 >>> (and fixed all the indention..). Issues I noticed but have not gotten
 >>> to: --[[Joey]] 
 >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]]
->>>
->>> * `rcs_diff` already exists; why add `rcs_showpatch`?
->>>> If `rcs_diff` is intended for human consumption, by all means we can use that. -- [[peteg]]
 
->>> * Would it be better for `rcs_revert` to not commit, and
->>>   `rcs_commit_staged` to then be used? This would work for git, but
->>>   maybe other RCSs would be problimatic. It would simplifiy the
->>>   interface and allow for future mulitple-revert interfaces.
 >>> * I quite don't understand why one caller of `git_parse_changes`
 >>>   needs it to chdir, and not the other one. It's running
 >>>   in the same git repo either way, and git doesn't need