From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.taht.net (mail.taht.net [IPv6:2a01:7e00::f03c:91ff:feae:7028]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 7730A3B29E for ; Tue, 28 Nov 2017 13:48:31 -0500 (EST) Received: from nemesis.taht.net (unknown [IPv6:2603:3024:1536:86f0:2e0:4cff:fec1:1206]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.taht.net (Postfix) with ESMTPSA id 2F6E021341; Tue, 28 Nov 2017 18:48:30 +0000 (UTC) From: Dave Taht To: Kevin Darbyshire-Bryant Cc: Cake List References: <700AAEDF-6D34-4F0B-8B48-E34A554F5B6D@darbyshire-bryant.me.uk> Date: Tue, 28 Nov 2017 10:48:28 -0800 In-Reply-To: <700AAEDF-6D34-4F0B-8B48-E34A554F5B6D@darbyshire-bryant.me.uk> (Kevin Darbyshire-Bryant's message of "Tue, 28 Nov 2017 09:22:40 +0000") Message-ID: <87a7z6p7cz.fsf@nemesis.taht.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Cake] Cake tree unreadable X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Nov 2017 18:48:31 -0000 Kevin Darbyshire-Bryant writes: > In the nicest possible way=E2=80=A6 what on earth is going on with the ca= ke source tree > of late? Many =E2=80=98cascaded=E2=80=99 merges make things impossible t= o read and stuff > appears to be getting lost as well. e.g. the recent change "Switch ingress > failsafe to 2/3 instead of 1/4 bandwidth.=E2=80=9D has now appeared twice= , the first > time having somehow got lost. What on earth is going on? > > It=E2=80=99s as if there are at least 3 repos that have all got out of st= ep with each > other and now each time a merge is required from one it pulls in all the = merges > from the others. May I suggest a =E2=80=98git fetch =E2=80=94all=E2=80= =99, take a safety copy branch > pointer of where you are now =E2=80=98git checkout -b safety=E2=80=99, sw= itch back to where you > were =E2=80=98git checkout cobalt=E2=80=99, reset the pointer and current= work tree to > upstream=E2=80=99s sane state =E2=80=98git reset =E2=80=94hard upstream/c= obalt=E2=80=99 and finally a =E2=80=98git diff > safety=E2=80=99 to see what=E2=80=99s missing between the two. =E2=80=98= git cherry-pick missing-commit=E2=80=99 > to grab any missing commit/s determined by looking at the diff. It sounds like your git-foo is stronger than ours! I'm not even trying to get head to work, tho my intent would be to promote cobalt to it. I didn't know about the cherry-pick option til now, either. I was doing a git format-patch thenewcommit, then a git am on my other branch. For example, with this config, git fetch --all doesn't do anything. [core] repositoryformatversion =3D 0 filemode =3D true bare =3D false logallrefupdates =3D true [remote "origin"] url =3D git@github.com:dtaht/sch_cake.git fetch =3D +refs/heads/*:refs/remotes/origin/* [branch "master"] remote =3D origin merge =3D refs/heads/master [branch "for_upstream_4.16"] remote =3D origin merge =3D refs/heads/for_upstream_4.16 [branch "cobalt"] remote =3D origin merge =3D refs/heads/cobalt