Keep in mind that branching happens at the project/repository level.  That is, 
a branch is always of the *entire* repository in some (branch) state.  

I think my main point is that repository organization should be by document, 
since there is no way to do all the documents in lockstep with AOO dot 
releases.  There does not seem to be any capacity for the level of effort that 
would require.

The tricky part, since you can't go finer other than by external agreement 
(e.g., naming branches to identify the guide and release they apply to, say), 
is figuring out how to resolve pushes of changes to different guides that are 
collisions at the repo level.  Collisions in the same guide are presumably 
reconcilable, although/because there is no diff for ODF-format files.  It's all 
or nothing or whatever adjustments happen off-line before a change is made to 
the branch in the main repo.

Big projects have organizations structures among editors/captains/committers to 
help manage the review and roll-up of changes.  Git was invented to facilitate 
that with an organized hierarchy for the march of changes into a new release 
(e.g., for Linux itself).

With regard to the work that Francis is doing, is it showing up on the 
repository or are folks reporting what they are doing entirely off-line?

 - Dennis

-----Original Message-----
From: Keith N. McKenna <keith.mcke...@comcast.net> 
Sent: Thursday, February 4, 2021 16:46
To: doc@openoffice.apache.org
Subject: Re: Repository Organization

[orcmid] [ ... ]

It does certainly make sense. I was thinking more along the lines that Dennis 
outlined and keeping each guide in its own Branch and use tags to specify what 
revision of the software it applies to. That way if it is applicable to another 
version as well we tag it that way and not have to redo the entire guide. Also 
if there are only minor changes we can do errata sheets and not have to redo 
the entire guide.

regards
Keith
[ ... ]

---------------------------------------------------------------------
To unsubscribe, e-mail: doc-unsubscr...@openoffice.apache.org
For additional commands, e-mail: doc-h...@openoffice.apache.org

Reply via email to