Lots of things could have happened, including the branch commits being "squashed" when they were merged into dev or further playing around on the branch after it was merged (pretty sure both of those happened with hcayless-appcrit). I wouldn't worry about it too much. Also entirely possible someone "merged" by copying one or more files from a branch to dev and committing them. As Raff points out, it's looking strictly at commit hashes, not at the content of file changes, so merge commits might be part of the reason too. On Fri, Dec 16, 2016 at 11:37 AM, Raffaele Viglianti < raffaeleviglianti@gmail.com> wrote:
Hmm. Is it possible that those changes were made directly in dev? I think the behind/ahead count is based on commit SHA numbers as opposed to the actual content of commits.
I'm too lazy to test this, but I think if you make a change in branch A (0 behind, 1 ahead) and then make the same change in Master, branch A will be 1 behind, 1 ahead.
If those corrections you mentioned were indeed merged, then I have no idea what's going on :)
Raff
On Fri, Dec 16, 2016 at 11:31 AM, James Cummings < James.Cummings@it.ox.ac.uk
wrote:
On 16/12/16 15:24, Raffaele Viglianti wrote:
"Behind" indicates how many commits are in the dev that are not in the current branch, and "ahead" indicates how many commits are in the current branch that are not in dev.
Hi Raff,
That was my understanding but for some reason the att.global.source branch, that I've now deleted and so can't show you, was saying it was 5 commits ahead of dev, but those commits were all the work that I'd done on it including the last one where I'd forgotten to put predeclare="true" on the classSpec. But when I look at dev all of those changes were merged in perfectly fine. i.e. https://github.com/TEIC/TEI/blob/dev/P5/Source/Specs/att.glo bal.source.xml#L9 has the predeclare="true" in it.
But it was still saying it was 5 commits ahead because of these.
You see why I'm confused, right?
-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
-- 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