From owner-freebsd-git@freebsd.org Thu Apr 9 19:39:06 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 210A627C5FA for ; Thu, 9 Apr 2020 19:39:06 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48ys095qpQz49Cr for ; Thu, 9 Apr 2020 19:39:05 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id C61E827C5F9; Thu, 9 Apr 2020 19:39:05 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C5E4F27C5F7 for ; Thu, 9 Apr 2020 19:39:05 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ys094kg9z49Cq; Thu, 9 Apr 2020 19:39:05 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-qk1-x736.google.com with SMTP id j4so5273450qkc.11; Thu, 09 Apr 2020 12:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yLv4Xc2e2oHcSHRhUFtWvQY7rh+dtmhRryRo/qWBuEg=; b=WCY4FrdPZ2aL6SCy7IZOJeeEgel9g45u3wQd9ykCJspKLKiUyZChiqyE/9h4l/b7SF bGvT5WwTHSVON6gkwhp6BfzLAYiNSsYoHtgmUpx4ksrEY9eOb58t0Bm4HseW4LSqnWXX eMnFKe+ONs8DPoKK5ORpHbDh7NLucuusn8RAnvkeVI9NQbHIrmaLDIE21a32UaM8QpDa Ax6san8ed0KYdqMggV9UTMUfA4yOe3f+XwH7Hr0Qf2Aekm2w6LwplCncxCt31YnmSikZ 2JDhtokOwBdaPLehcQWnMIPPos/8qsg6RyqF00lk0IO81yq9vTVojuDsuAAlTx13NcHS BqXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yLv4Xc2e2oHcSHRhUFtWvQY7rh+dtmhRryRo/qWBuEg=; b=TElVmdQjO3UAKUFP/OJHvAaClTIJO/BhurjtmdtCByn3cI4WAyybRLqoEjLMGl5mP/ dH3uUGRx6A755KhFKR6jLxzqoVfH/OX/kCxr26zjb0CEP0ZaINhNJut3yGSbEHug2SCr izdza2zBHOC4htpcOPw+k9QHhs/eWfBtaxxfC6JXJ0GjdHIFRc8X63lqHOhFa0pQBilG s2TRdD+dp2lwok4Ou7AamZRwLHoxFY0MSymDgVYC9fDUgr3FTE81chIal51bGz42Ziqe +JsQZ+C1OoEP+wfOL/At/IO58mwsMXhJ1uwO/iRcQ0HS0pG7w5o/5XuTFITAia9NXM9e PEEw== X-Gm-Message-State: AGi0PubB0U/0v8hP7PFjdiejv1CVq6lkJoJCvENyoKusPj+8WqpE56dY 31X8p7oyX/f81Z5pPgHeJv/mxxctFHhXR7glq/fc8g== X-Google-Smtp-Source: APiQypKeu3B6dX/TgHiD8i5Bu9/uhSetjw+xPjc7Pp4Nk7hVk+lTiloHm9Pebwfk1kqfr9FZMQdSdj7BNUrZAj2/ktk= X-Received: by 2002:a37:b2c5:: with SMTP id b188mr511642qkf.98.1586461144448; Thu, 09 Apr 2020 12:39:04 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ryan Stone Date: Thu, 9 Apr 2020 15:38:53 -0400 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48ys094kg9z49Cq X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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, 09 Apr 2020 19:39:06 -0000 On reflection, I believe that what as happening was that the converter was using newly created files as a really bad heuristic for merges so that it would not have to try and understand mergeinfo. On Thu, Apr 9, 2020 at 3:26 PM Ed Maste wrote: > > On Wed, 8 Apr 2020 at 15:00, Ryan Stone wrote: > > > > The converter behind the current tree on github (or rather, checking > > my email, whatever uqs was running back in 2012) > > But - you believe it was fixed at the time? Because as far as I can > tell svn2git has never understood mergeinfo.