Add new attachment

Only authorized users are allowed to upload new attachments.

List of attachments

Kind Attachment Name Size Version Date Modified Author Change note
README.txt 66.9 kB 4 04-Feb-2006 07:18
java 15.2 kB 1 21-Feb-2005 21:48 MikeOliverAZ

This page (revision-88) was last changed on 10-Oct-2011 16:01 by Janne Jalkanen  

This page was created on 12-Apr-2002 18:10 by JanneJalkanen

Only authorized users are allowed to rename pages.

Only authorized users are allowed to delete pages.

Difference between version and

At line 148 added 25 lines
I am using the file system versioning and it seems to work quite well. One thing I think would add some value is to implement something that is similar to feature branches. This would allow a user to work on a draft copy and continually save, without causing version clutter. For example:
* The last check in version of a page might be 1.2
* I edit the page but suspect that I won't have it complete in the short term, so will need to save an intermediate copy
* Rather than click "save" I choose to save a draft copy (equivalent to a private branch)
* This new copy is saved in the file system as - nobody else can see it except me
* I make some more changes, and save again as
* Now my work is complete, so I choose to "merge" my changes back to the main trunk as 1.3
* The feature branch can now be discarded, reducing the file system clutter
Now, the tricky part is how to handle the merge. Some options are:
* apply my changes back to the main trunk, blowing away any subsequent edits that another user makes (easiest)
* deny the merge (easy, but impractical)
* perform some sort of smart merge (harder to implement in software)
If the first option was implemetned and I was a nice person, I would just manually merge the content myself. This would probably be the easiest approach to take in the beginning. You could also limit the user of private branches to certain trusted users.
What do you think?
--DavidC, 09-Sep-2006
Version Date Modified Size Author Changes ... Change note
88 10-Oct-2011 16:01 7.813 kB Janne Jalkanen to previous
87 10-Oct-2011 15:11 7.585 kB to previous | to last added Q: Can I switch back and forth with FileProviders?
86 10-Oct-2010 16:39 7.043 kB Dirk Frederickx to previous | to last remove spam
85 09-Oct-2010 00:23 7.171 kB Razan Abbass to previous | to last
84 26-Sep-2007 23:44 7.043 kB JanneJalkanen to previous | to last
83 26-Sep-2007 02:51 7.057 kB to previous | to last
82 16-Jan-2007 04:25 7.043 kB to previous | to last
81 09-Nov-2006 15:23 6.89 kB SergeBakhteiarov to previous | to last
« This page (revision-88) was last changed on 10-Oct-2011 16:01 by Janne Jalkanen  
G’day (anonymous guest) My Prefs
JSPWiki v2.8.4-svn-9