Fix bug that kept submissions with rebased changes from showing up.
diff --git a/doc/latest_release.txt b/doc/latest_release.txt
--- a/doc/latest_release.txt
+++ b/doc/latest_release.txt
@@ -1,3 +1,8 @@
+Fix bug that kept submissions with rebased changes from showing up in the
+"Discover" page in the 67724663687a version.
+
+
+67724663687a:
I added preliminary support for rebasing changes from other wiki versions.
You can load a "secondary" archive to rebase from either by using
diff --git a/readme.txt b/readme.txt
--- a/readme.txt
+++ b/readme.txt
@@ -84,7 +84,6 @@ sethcg@a-tin0kMl1I~8xn5lkQDqYZRExKLzJITr
---
Dev notes
---
-BUG: Default FCP port wrong for CLI client. [requested by a real user]
BUG: fix the discover UI to correctly handle posts from a different nym than the insert
BUG: wikitext should use unix line terminators not DOS (+1 byte per line)
BUG: MUST show in the UI when edited wikitext has been truncated because it's too big.
@@ -122,6 +121,8 @@ IDEA: Freetalk vs Freenet interop
Hmmm... not sure if people would use this feature because of the correlation of ids.
---
Fixed bugs:
+8cfb2f3e7c38 BUG: Default FCP port wrong for CLI client. [requested by a real user]
+ [The default port is set to 9481 now and can be set via Java System properties. See ./script/wa.sh]
710d700bc7a1: BUG: Header links to discussion pages. [requested by a real user]
2ce3a4499a2c: BUG: No way to create an empty wiki from the UI. [requested by a real user]
cab9533f4cb8: BUG: Can the <<<TOC>>> macro be made to play nice with the ContentFilter? [suggestion from sethcg]
@@ -142,4 +143,4 @@ 08d1b85d8ddd: IDEA: Pillage glog graph d
because of the way the version is string is generated.
Finished Chores:
-cce3742a46d6: CHORE: Write a script to cut releases and insert them into freeneet.
+cce3742a46d6: CHORE: Write a script to cut releases and insert them into freenet.
diff --git a/src/fniki/wiki/child/LoadingVersionList.java b/src/fniki/wiki/child/LoadingVersionList.java
--- a/src/fniki/wiki/child/LoadingVersionList.java
+++ b/src/fniki/wiki/child/LoadingVersionList.java
@@ -166,7 +166,7 @@ public class LoadingVersionList extends
}
fields = fields[1].split("_");
- if (fields.length != 2) { // LATER. handle multiple parents
+ if (fields.length < 2) { // LATER. handle multiple parents
if (fields.length == 1 && fields[0].length() == 16) {
// Assume the entry is the first version.
return "0000000000000000";
@@ -175,7 +175,7 @@ public class LoadingVersionList extends
return "???";
}
- return fields[1];
+ return fields[1]; // LATER: tighten up.
}
final static class DAGData implements Comparable<DAGData> {