Thanks Lou. I'm still confused about the being ahead/behind thing... I thought it was straightforward but the att.global.source branch had things which the compare said were ahead of dev that were added to the branch long before it was merged into dev, and are in the release we just did so..... how can it be ahead? Surely when that merge happens it is no longer ahead by those many...right? So if you can let me know whether those 25 were added before or after procmod was merged in I'd appreciate it just for my own understanding. -James On 16/12/16 11:20, Lou Burnard wrote:
Lb42procmod was me testing the processing model. I will have a look to see if any of the extra stuff I added should move to test and move it if so.
Sent from my Huawei Mobile
-------- Original Message -------- Subject: [tei-council] TEI branches From: James Cummings To: TEI Council CC:
Hi all,
What is our policy on keeping old branches around? I suppose it makes sense to keep the release ones (for awhile at least), but I've just gone and deleted the att.global.source one since I believe that all got merged in. Why do some branches that have been merged in seem to still be X number of commits ahead of dev?
I notice that we have 23 branches so wondered if we shouldn't be getting rid of some of those. The current list of branches is at:
https://github.com/TEIC/TEI/branches/all
Ones that I'd probably assume should be deleted include:
lb42-procmod (I assume this is all merged in though it says 498/25 (that is 498 behind dev, 25 ahead) .. that 25 makes me nervous.
msFrag (517 behind)
hcayless-appcrit (674/32)
sydb-xenodata (691/65)
peterstadler-antify (13560/12861 !) Not sure what this was for? Peter?
P5 (13566/56) Might be a confusing branch name? Was this an archival one? Rename if keeping?
P5-Council (last updated 8 years ago? Is this a historical one? Does it have anything interesting?)
P5-selections (updated 10 years ago by sydb)
Just thought I'd mention it since I think we should have branches for dev, master, release-X.Y.Z, gh-pages, and $anythingWeAreCurrentlyWorkingOn (Plus maybe a couple historical ones like sf/trunk?)
What do others think?
-James
-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford