Erin Schnabel a écrit :
[snip]
I prefer to allow document versions to start at an
arbitrary number
(i.e. if I've imported the document from another wiki, I like to
preserve the version of the document from the original wiki in the
target wiki). This means that the first version of the document may be
1.9, and that's certainly a lot more than one version off...
That's indeed possible to do. The versions don't need to be off though..
The document version will match the version in RCS.
It's not a problem to have versions start at a certain number. This
happens if the resetVersion API is called.
The problem is different than this out of sync issue between RCS and the
current document version. Here our problem is that the RCS version does
not match what you have in the archived XML document..
I've made progress with my fix. You can check out a fix in
http://jira.xwiki.org/jira/browse/XWIKI-1468
Now for your suggestion of having imports not resetting version, I think
both cases are interesting. Sometimes we want to reset (like when
importing a default wiki).
There will need to be an option to decide if you want to reset version
numbers or not.
Ludovic
I don't see a huge issue with revision numbers
being different than
version numbers, though it is an issue w/ matching the display..
There is a way to tell RCS to start with a different version: "The
initial version number for a newly registered file is 1.1, by default.
You can specify a different default by setting the variable
vc-default-init-version, or you can give C-x v i a numeric argument;
then it reads the initial version number for this particular file
using the minibuffer." -- seems like including some way to start at an
arbitrary number != 1.1 in the RCS record itself might be the best way
to solve the problem (when the diffs are RCS backed). I haven't
checked out the javadoc, but a cursory investigation of the
constructors seems to imply that JCRS supports this too (passing a
version in w/ the constructor)...
Erin
--
Ludovic Dubost
Blog:
http://www.ludovic.org/blog/
XWiki:
http://www.xwiki.com
Skype: ldubost GTalk: ldubost
AIM: nvludo Yahoo: ludovic