On Sat, Jun 06, 2009 at 02:00:03PM -0400, rgheck wrote: > Uwe Stöhr wrote: > > rgheck schrieb: > > > >>>> Here's another suggestion: ct should always be used when editing docs, > > > > Yes, this is already the policy. > > > >>>> but then anyone who edits the file again should accept all changes > >>>> before doing anything else. > > > > This would make it impossible for me to keep the docs up to date. > > Imagine Georg adds something about label translation, 3 hours later > > Jürgen adds something about thesaurus. Result: When Jürgen would > > accept the changes, I will loose Georg's changes. > > > No, you don't, because the whole history is there in svn. You run: > svn log --limit 10 doc/UserGuide.lyx > and see the last ten changes. Let's say they were at r15, r18, r25, etc. > Then you do: > svn up -r 15 doc/UserGuide.lyx > to get the first one. See it, do what needs doing. Then > svn up -r 18 doc/UserGuide.lyx > gets you the second one. Etc. The translators can all do this, too. > > But here's another couple aspects to the suggestion. > > (i) Anyone accepting changes should do so and immediately commit before > doing anything else, and log acceptance of the changes as such. Then to > see what was accepted one just updates to the preceding revision. > (ii) Someone making new changes needn't first accept the old changes if > they aren't in the same area of the docs. This only has to be done if > the revisions overlap in some way, or if they're close enough together > as to cause problems. This will keep the number of revisions one has to > examine down a bit. > > I think this makes for a clean workflow and revision history.
This is too much complicated, IMO. You simply need to make a copy of the manual that you monitor and when you want to see what has changed, you simply run ldiff against the saved and the current copy. http://www.cs.bgu.ac.il/~dekelts/ldiff/ -- Enrico
