From owner-freebsd-git@freebsd.org Wed Jan 4 22:25:15 2017 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7FF2C9F2F3 for ; Wed, 4 Jan 2017 22:25:15 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-it0-x22c.google.com (mail-it0-x22c.google.com [IPv6:2607:f8b0:4001:c0b::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AE6091923 for ; Wed, 4 Jan 2017 22:25:12 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-it0-x22c.google.com with SMTP id c20so315401294itb.0 for ; Wed, 04 Jan 2017 14:25:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=MKMY3eKendcyCS7PtcOf3NFx+sFUSgw6T3x7E72LFYk=; b=ZkiO4WL8o7BYEmvpIh/hEv+e05yjj/aAS+uKMTmEKv+EFkP/0tSQQ3WPQDsGydNnuC vXURV1KRzxUW7v9E8yt0SJBYsfBnEJyF6zo6GdPkeik2+v+WvhQKBBPGNiIFj0bsCipO iAsIeEKXL76qo27cDnobITcIih9jtY/zg7Ia7vopD2L+3XLoPax2RsiVe3dMtQsMolvs 731tNeAjexS2hcmvfFzvdektUmxJ6j0G2kgVr8izv1qvktK/m/3TtyCz94jOm3CL+V3W y7hmT8/tvV9o2bufQ01UnB/ji5oZyeUQRE1Bj1XovTjdXgpk8+RZuTUdHgM34vqQBYuc bAGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=MKMY3eKendcyCS7PtcOf3NFx+sFUSgw6T3x7E72LFYk=; b=eAbvW8ohyWE3gvOkHl7zf2RGQkgIMVKW9fNzIO6H4dbTbbOkDXtu9qnk9do7LUCql3 p5LWQjxRuffdzoWKt4+48jbwUrgztxcgtZKlDpQDZ4ZqG8VT3v1m7tPkx0MH3BLA9jLN bqMxosJvbHpIezv3CL+lY/zmlQJt350SOeoTius4FmfMJSGQ2eHBLsr8zWvgN/8995M8 W5Rr3W++B4/l7GkhjXa6P+WPAC7E77VMZuNigekAdnr7+v42quRvdMpYX3KQ9fLYh2Es DmuPLvtqmJ6haM0h1p0YbdHOoJgq/iEBdvfvwdxB598bzuZuQB+QR+VuhTrXE046bk2+ iizQ== X-Gm-Message-State: AIkVDXLaN3KYku0JbKClC0+JezPwmMQ/KtAShsO7ISkvz0CMKGd9/Typgk/Z0g1mHUQ3LtYhwh9kr4G46V/s6w== X-Received: by 10.36.212.66 with SMTP id x63mr49990790itg.14.1483568711868; Wed, 04 Jan 2017 14:25:11 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.175.133 with HTTP; Wed, 4 Jan 2017 14:24:51 -0800 (PST) From: Ed Maste Date: Wed, 4 Jan 2017 17:24:51 -0500 X-Google-Sender-Auth: jwxbltyNkJC_aeKFFblPFZU_H6o Message-ID: Subject: FreeBSD svn2git aborting: potential workaround To: freebsd-git@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2017 22:25:15 -0000 I'm trying to reproduce the svn2git conversion locally in order to investigate nonreproducibility issues. I'm in the process of cloning a local copy of the svn repository with svnsync, and am running uqs' version of svn2git (obtained from http://svn.freebsd.org/base/user/uqs/git_conv) against that. Initially svn2git was aborting on me: Exporting revision 70017 ....... 7 modifications from SVN /head/ to freebsd-base.git/master done Exporting revision 70018 . 1 modifications from SVN /head/ to freebsd-base.git/master done Exporting revision 70019 ...... 6 modifications from SVN /stable/4/ to freebsd-base.git/stable/4 done Exporting revision 70020 . 1 modifications from SVN /head/ to freebsd-base.git/master done Exporting revision 70021 . 1 modifications from SVN /stable/4/ to freebsd-base.git/stable/4 done Exporting revision 70022 .............Failed to write to process: Error writing to process Abort trap (core dumped) When restarting from an empty git repo it aborted after the same revision. When this happens more detailed information is emitted in the log-freebsd-base.git logfile: progress SVN r70019 branch stable/4 = :70720 progress SVN r70020 branch master = :70721 error: failed to apply delta fatal: Can't load tree 7d74bacb97098f62f3df6c00dea2ca477526c5b6 fast-import: dumping crash report to fast_import_crash_27754 And the referenced fast_import_crash_27754 has a lot more information in it, although it was not helpful to me in trying to take the problem to root cause. I did find that adding "--commit-interval 10" to the svn2git command-line avoided the abort, and also cleared up a diverging git hash between the official mirror and my local clone. In the official mirror r17572 is f7b4db0557177ace5810a3905ec4eaea478862b2; in my clone it was 9aec003234685887537aeda5d6408cb54d2a066f, but trying to show that hash resulted in: % git show 9aec003234685887537aeda5d6408cb54d2a066f error: failed to apply delta error: failed to read object b7e21351967a525e1e4146ab43a981d0ddf34d71 at offset 117543675 from ./objects/pack/pack-c4fb2c8279432e4e8701c0b35df7cce79a96fa1d.pack fatal: packed object b7e21351967a525e1e4146ab43a981d0ddf34d71 (stored in ./objects/pack/pack-c4fb2c8279432e4e8701c0b35df7cce79a96fa1d.pack) is corrupt It seems to me that git is at least partially at fault here. With the default settings (i.e., no --commit-interval) either svn2git is generating valid fast-import data and git is responsible for the failure, or svn2git is generating invalid data and git is doing insufficient validation. "--commit-interval 10" may be overly conservative (I think the default is 1000), but it seems to be an effective workaround until we can take this to root cause. From owner-freebsd-git@freebsd.org Thu Jan 5 12:16:00 2017 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9157DC9F358 for ; Thu, 5 Jan 2017 12:16:00 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-io0-x22a.google.com (mail-io0-x22a.google.com [IPv6:2607:f8b0:4001:c06::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 501F61324 for ; Thu, 5 Jan 2017 12:16:00 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-io0-x22a.google.com with SMTP id f103so9262160ioi.1 for ; Thu, 05 Jan 2017 04:16:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=9kI0eAgY7pxmBJsRZbfA2cayVCJA5qA/dfuwzuLTsI8=; b=dMU1nETEKcdNqRIRNvTvrZ+bKJiLKsFxAF4rbVa/y3UUQFkR7DbskbkUlY7svO/Q6t hrymk/j0LnRoG55M3JD3SN4OmLD7bdQPmdjMrIbl4mr4iNPG6m+LzcI+ptla0l4CIpE2 9y8hizt4qD1XKkO1pGDWv2h+4o5tOgoXWtnOatSQIRrtbBNqVaiT3GqVJU227CrFfVea jVSnLutPhjPDpLMmqY7s4g9stxQVoagornQE5CykpuwtSU826m/yelh6hqh6i9PYiJuk QzOXg1nVSm3SYOMyX8e+1waj6KBeqf+44Z+vd8T+xoqqVWcEwckiuKYDoCh+QOGI+2FJ 8EGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=9kI0eAgY7pxmBJsRZbfA2cayVCJA5qA/dfuwzuLTsI8=; b=SCDwcFtdC++81K1ZzoK2bqaQdJZtDNKAuBSZjz0mWKcrGygncniqOcrpnSRF1oWSOt XLoFTQ4XWA6yifAVW2Ahn28vxUPhanjlmgkYaC3WOkUFe0JQg9Q8IiJsqqn6RXWA+0sH 5xNzkyz/UaO5gddj9IKjaoHW9/sgi7h10VJwgYy26ApayBx9itc9IHzRMn+gDWWQDgjd Tb2OJ7rZ4Kz+dP87cFjngV8hzJZK+HpPHy82iRbARmdxSgULp1PKIup1/3QM02Rxs35d sO1Arjqr91K4sDvLG8khy2pWCxZCyNRcJBMiH7fGHglOqZ/GYOzhKGXvVADyUDYCp+Qe JKgA== X-Gm-Message-State: AIkVDXIBEkrH3naMixSZxQYZD3XsFRTQTmUjEgmjpkQ8wV51Tj89Wj061LcFRVBq+nylgu5QRiil3v9m+KYPJQ== X-Received: by 10.107.59.87 with SMTP id i84mr51998672ioa.204.1483618559707; Thu, 05 Jan 2017 04:15:59 -0800 (PST) MIME-Version: 1.0 Sender: uspoerlein@gmail.com Received: by 10.107.58.138 with HTTP; Thu, 5 Jan 2017 04:15:59 -0800 (PST) From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Thu, 5 Jan 2017 13:15:59 +0100 X-Google-Sender-Auth: 4IFjAia30EtTuSD22CGLeNrDmL8 Message-ID: Subject: github admin teams converted from legacy teams to the new thing To: freebsd-git@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2017 12:16:00 -0000 Hey, I'm totally confused with github's permissions model when using organizations, as we do. In any case, I've clicked the button that migrates all legacy admin teams (whatever that means). Let me know if you can no longer do the things on github that need doing. Thanks! Cheers, Uli From owner-freebsd-git@freebsd.org Thu Jan 5 15:00:23 2017 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2AD3CA0ECB for ; Thu, 5 Jan 2017 15:00:23 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-it0-x22e.google.com (mail-it0-x22e.google.com [IPv6:2607:f8b0:4001:c0b::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE9E21826; Thu, 5 Jan 2017 15:00:23 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-it0-x22e.google.com with SMTP id c20so328454735itb.0; Thu, 05 Jan 2017 07:00:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=Jkx80N1TxQ5EGVMoKbmfn02b1JnGqXxIqzAJ9KxykvQ=; b=enSJ23qIpE2jlk8kq+HwOvtC+nq7olfIHYdfsaDIuxNPb9EJVrlXbP/Q+CXi8r9X7X qHSQ3Bv7WNyc+7FdlPD7mxro+2w4aFmeIf/bw4y7XTJhE/7F1SEzSTr18JhDeanab1dS DQw7wEbA9f/JFCtbwSBP0ekPQhDSUbVWOXZa0SnT/mJ/DrSWIZQj1zI2I4YCtWfkBYli ydD7RoGT7zld6WiQEhCEaeOi9Qp533pgSsPvI/NAKJh7z/xrTtAuvrj5OnpcCL3CTWaZ fR4IaQ74VbVEDxJK9M/HHPfnTKlBlLbGo0UUolWUjeQSnCpxxXxvzwF1l3zcFdz/YN0p elkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=Jkx80N1TxQ5EGVMoKbmfn02b1JnGqXxIqzAJ9KxykvQ=; b=LxCu3XBJLHvS+YoatNy4Nz9GV+9b3a5t5j9icUAOckuGeWO62mnAwyqbG2cDvRBGnn gDMfE6dCvk9cj3yIs39XR22atppqmqgAlrqABS3pnmNaDAcg9w3xtsAFoBXysM/Lyb4c 89Inxa+4m5zJhOUB0cpdL32DAshNJ6g+jOOiplidFvYHIEce+s/t6xGGCNJEtNFkOU8W 0iqGvFyZTUGP2T3PZ4enZtocEfjehVzRXWSj0Nw2bs9AL8PZvPfkic2mildttEmtCq8O FMIQ8c54XxOx5nDaRzMh8zwh2ITc/92/jdcfqNlxVI7vdub0riRfBaqTObO+NLdTV2Oj tR1A== X-Gm-Message-State: AIkVDXJuErXzOU1qMyiziJQj0Y5UcSwfepWl7XFKL2xutRn4eZbD2+Kw9XOlJjTS/R67MZBVODUol5/aExZpeQ== X-Received: by 10.36.23.144 with SMTP id 138mr44789583ith.13.1483628422889; Thu, 05 Jan 2017 07:00:22 -0800 (PST) MIME-Version: 1.0 Sender: uspoerlein@gmail.com Received: by 10.107.58.138 with HTTP; Thu, 5 Jan 2017 07:00:22 -0800 (PST) From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Thu, 5 Jan 2017 16:00:22 +0100 X-Google-Sender-Auth: x2P3dkQNCON2FBp6jeR-Z2t66ik Message-ID: Subject: Heads up: upcoming github teams/memberships cleanup To: freebsd-git@freebsd.org, git-admin@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2017 15:00:24 -0000 Hey all, we have several "teams" on github, that have no repository associated with them (eg. secteam, or portmgr). I will soon remove these teams, as they serve no purpose. We are not using the github wiki or issue tracker and the base/doc/ports repositories are essentially read-only on github as SVN is our canonical source of truth. So instead of chasing who belongs to which team (e.g. with every portmgr rotation), I will remove most of these groups that are not being used to gate access to the non-base/doc/ports repositories. I will also remove most admin groups as you can now promote members to be "team maintainers" so we can use this going forward and this should keep things more sane. Speak up if you're using the current team structure for something else and really need it, or if my changes cause problems otherwise. I'll update this thread once the changes are in, Thanks Uli