From owner-freebsd-current@FreeBSD.ORG Wed Apr 22 23:13:02 2015 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C9D64C4; Wed, 22 Apr 2015 23:13:02 +0000 (UTC) Received: from mail-la0-x22b.google.com (mail-la0-x22b.google.com [IPv6:2a00:1450:4010:c03::22b]) (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 971CE1311; Wed, 22 Apr 2015 23:13:01 +0000 (UTC) Received: by lagv1 with SMTP id v1so855323lag.3; Wed, 22 Apr 2015 16:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:cc:content-type; bh=G9sW6xAQx3aT2f/DYvsSHQuSP683Hy4TLfEUTZYxYXY=; b=l8C7AAImJc4dUyhKhlIvglGqpK1g5DQqDfeVpyEWqwNGtWO8eFoSTcxw9vYhqYBm3F IhurV7fXo4/D2KzHS8tzMyre94A50Qv4Fd9zeplNVrm3WURsi3Ouy1/1UQfuRmD0EfDp 3KhvEQyoY6Lk1gE4IzFiSBV6HpNN3vy9xhd97C+J0A2U+UFioHS+G3NrfEpwScMzeBy1 i+O+WnX0kqhSroZxqTq97yh+KBz4T4QnHXefINTzHgInRkQVgUNtWepQD8B4FIS8ikPJ w/93Q86xJqe7NKNGglgkNL49IJfgCUiJtVe1w19AkP3OrjdE30n8Jl9nEMffWTu2MeuU QPrA== MIME-Version: 1.0 X-Received: by 10.113.10.134 with SMTP id ea6mr26392914lbd.29.1429744379551; Wed, 22 Apr 2015 16:12:59 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.112.164.38 with HTTP; Wed, 22 Apr 2015 16:12:59 -0700 (PDT) Date: Wed, 22 Apr 2015 16:12:59 -0700 X-Google-Sender-Auth: 2L9BANvdSWvbzneo490_a8ujHlU Message-ID: Subject: Merging GitHub Pull Requests into Subversion using git-svn From: Craig Rodrigues To: freebsd-git@freebsd.org Cc: freebsd-current Current , ports Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2015 23:13:02 -0000 Hi, Alfred Perlstein recently wrote this document for how to use git-svn for interacting between the FreeBSD Subversion repo, and the GitHub mirror of this repo: https://wiki.freebsd.org/GitWorkflow/GitSvn By following the steps in that article, step-by-step, I was able to: (1) take these three GitHub pull requests from Steve Kiernan: https://github.com/freebsd/freebsd/pull/26 https://github.com/freebsd/freebsd/pull/27 https://github.com/freebsd/freebsd/pull/28 (2) Pull them into my own git checkout of the FreeBSD src tree (3) Modify the commit message slightly (4) Use "git svn dcommit" to push these changes directly from my Git tree back to the FreeBSD svn repo: https://svnweb.freebsd.org/changeset/base/281844 https://svnweb.freebsd.org/changeset/base/281845 https://svnweb.freebsd.org/changeset/base/281855 While there were multiple steps involved, I just followed the steps in the wiki article, and it *just worked*! Thanks for writing this article, Alfred! While not as smooth as clicking a merge button in GitHub, this is a valid way to accept patches submitted via GitHub pull requests, and integrate them in our FreeBSD Subversion repo. -- Craig