{"thread":{"id":"58174","subject":"Branch next doesn't look like it was pushed","startedAt":"2022-07-16T14:41:53Z","lastAt":"2022-07-17T13:37:03Z","messageCount":3,"participants":["Stephen Smith","Junio C Hamano","Stephen & Linda Smith"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"459194","messageId":"12032556.O9o76ZdvQC@thunderbird","threadId":"58174","inReplyTo":null,"subject":"Branch next doesn't look like it was pushed","fromName":"Stephen Smith","fromEmail":"ischis2@cox.net","sentAt":"2022-07-16T14:41:47Z","receivedAt":"2022-07-16T14:41:53Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"Is there a reason that with the latest commits to the repository that next is \nno longer an ancestor of seen and than main/master is no longer an ancestor \nof next?\n\n\n\n\n"},{"id":"459214","messageId":"xmqqr12kwxhs.fsf@gitster.g","threadId":"58174","inReplyTo":"12032556.O9o76ZdvQC@thunderbird","subject":"Re: Branch next doesn't look like it was pushed","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-07-16T21:36:47Z","receivedAt":"2022-07-16T21:36:55Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stephen Smith writes:\n\n> Is there a reason that with the latest commits to the repository that next is \n> no longer an ancestor of seen and than main/master is no longer an ancestor \n> of next?\n\nLet's get to the latter half of your question first.\n\nTips of various branches of Git project can be observed at\nhttps://git.kernel.org/pub/scm/git/git.git/ and\nhttps://github.com/git/git (among other mirrors) and they are at\nthese commits:\n\n maint bbea4dcf42\n master 9dd64cb4d3\n next 4dd4a117ec\n seen c82b393ce5\n\nat the time of writing. The 'next' branch is designed to be always\na descendant of 'master', unless I screw up, and I'd appreciate if\nyou let me know when it happens. Right now, it is not the case,\nthough.\n\n $ git rev-list --count 4dd4a117ec..9dd64cb4d3\n 0\n\nNow, the 'seen' branch never was, and will never be, a descendant of\n'next'. It always is a decendant of 'master'.\n\nImagine how 'next' gets advanced. It will never rewind during a\nrelease cycle, so it starts at a feature release, and merges topics\nand also merges 'master' back. A topic might be merged once to\n'next', then the topic may gain a commit or two to fix a bug in the\npart of the topic that is already in 'next', and the updated topic\nmay be merged to 'next' again. IOW, some topics may have merged to\n'next' in multiple steps. Topics cooking in 'next' may graduate by\ngetting merged to 'master', at which time, the draft release notes\nis updated on the 'master' branch, and 'next' merges 'master' back.\nThis is to pick up the changes to the draft release notes. In other\nwords, the history graph of 'next' will be a mess.\n\nThe 'seen' branch serves three purposes.\n\n * The first is to allow sanity checking the result of messy merges\n into 'next'. For that, whenever 'master' advances, it is rebuilt\n from scratch from the tip of 'master' and merges each and every\n topic that are already in 'next' one by one, serially. Even\n topics that were merged in multiple steps to 'next' may be merged\n in full with a single merge to 'seen'. When all the topics in\n 'next' (and nothing else) are merged, an empty single-parent\n commit with title '### match next' is added. The idea is that\n the tree of this commit should exactly match the tree of 'next',\n or there may be some mismerges. The 'next' branch, since it\n forked from the last release point, may have merged these topics\n in random order, in increments, and also merged back the changes\n made in 'master', but the end result should be the same as\n starting from the latest 'master' and merging the topics that are\n in 'next' but still not in 'master' one by one, each as a whole\n instead of doing so incrementally.\n\n * The second purpose of 'seen' is to gather other topics that I\n happened to have seen together into a single integration branch,\n so that\n\n (1) I can forewarn myself of possible conflicts and interactions\n among topics in flight, and\n\n (2) I can have a simple way to list all topics in flight.\n\n This is done by merging the other topic branches, on top of\n 'seen^{/^### match next}' commit. To list the topics that I am\n juggling \"git log --oneline --first-parent master..seen\" is an\n effective way. For this to work, the rest of 'seen' cannot be\n built on top of 'next', whose history is allowed to be messy.\n This is why 'next' cannot be an ancestor of 'seen'.\n\n * The third purpose of 'seen' is to give me a version that I can be\n a guinea pig of. I have a build of \"git\" that is cut from a\n point in 'seen' that is used in my daily use.\n\nHTH.\n\n\n\n"},{"id":"459223","messageId":"2680398.mvXUDI8C0e@thunderbird","threadId":"58174","inReplyTo":"xmqqr12kwxhs.fsf@gitster.g","subject":"Re: Branch next doesn't look like it was pushed","fromName":"Stephen & Linda Smith","fromEmail":"ischis2@cox.net","sentAt":"2022-07-17T13:36:58Z","receivedAt":"2022-07-17T13:37:03Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"On Saturday, July 16, 2022 2:36:47 PM MST Junio C Hamano wrote:\n> The 'next' branch is designed to be always\n> a descendant of 'master', unless I screw up, and I'd appreciate if\n> you let me know when it happens. Right now, it is not the case,\n> though.\n\nI thought it had been, but you are right. Sorry.\n\n\n"}]}