From owner-freebsd-mono@freebsd.org Tue Jul 5 19:44:49 2016 Return-Path: Delivered-To: freebsd-mono@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 24005B21C78 for ; Tue, 5 Jul 2016 19:44:49 +0000 (UTC) (envelope-from radovanovic@gmail.com) Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (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 A79D01825 for ; Tue, 5 Jul 2016 19:44:48 +0000 (UTC) (envelope-from radovanovic@gmail.com) Received: by mail-wm0-x232.google.com with SMTP id z126so87907290wme.0 for ; Tue, 05 Jul 2016 12:44:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=t5LB9uIGfiN6aRybhpVcHVYyuMBxfaqFZ9vJIIV8rHg=; b=tOVBAx1+HA4PlQxPqekCNofw/k7snERxe4unSJURxvOO2M+jRSSf/Uf56T+ii8n/Ju VVBMXxs0wmxIH1wobPON9B/GYjltdo2h+Ugg1SyPJASY+NeZitKWi2C6fDKvDGGQ6ech 76sYR5ii0gjPzYS6kwDko6sE0IFoMeqGNULrXV0YC+EmXjyHMFvMSI8xALI6SPPxSFB2 zA8UKDt7puZkvxdELYEdTwZAdWXRYjvezBSbQFcMPkDcu9oFPjprXe8HeT3IzbWJWMGr +Y+Y5MvofT4WvL5UJtJh5YH5m+WNCJmeHu58yspttQrb+0Etl7ae4L+1/8H0vGXSJU5h hzjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=t5LB9uIGfiN6aRybhpVcHVYyuMBxfaqFZ9vJIIV8rHg=; b=jhXu57lPAUV7zE5AoO+FVQyoCBFRqBn8SzCzOMNxd7dtyLRQO52G3ajZ0VkQOrCTrz V7QqfGXyYRQOHCqbVywYYFCPG5/DrTOvw4WVaA49eI19Ilh3UMWjX3PynnXehR4tmyxg X5MHYwqP3B3jPG8EIL/4hstTF+xLbzhVg2vQ9+n3VCMGbw4INRbONO98KdY6iILnI5M4 jNm1V4X9LGyyxzS+R6eHYpU/g5rKQ2QT0scIJKHmnhZ30QpyPSUlbycMpiBn3cn/ESf+ aD0wBlhwtsng8pFqTHWLrWDGaa2psNMShqy8MhuDzEkLNRsaJRyXn/l7giHwOoMMTnDm oo9g== X-Gm-Message-State: ALyK8tJusir3lImPvHRXOpXH1i7r+U+cz4Fx2SmM4BldkeDTTQL9hB92DlacWae7+/jgUQ== X-Received: by 10.28.214.73 with SMTP id n70mr16974329wmg.13.1467747886709; Tue, 05 Jul 2016 12:44:46 -0700 (PDT) Received: from azdaja.softwarehood.com ([95.180.7.31]) by smtp.gmail.com with ESMTPSA id c142sm3055876wme.18.2016.07.05.12.44.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jul 2016 12:44:44 -0700 (PDT) Subject: Re: Maintaining mono/.net To: Russell Haley References: <20160628094307.bepxy46dp5igizeh@ivaldir.etoilebsd.net> <1526452.AT2qT6pE07@dragon.local> <20160629195854.4698194.67297.7966@gmail.com> <577BCCE9.10504@gmail.com> Cc: Freebsd-mono , Mathieu Prevot , Carsten Larsen , =?UTF-8?Q?Romain_Tarti=c3=a8re?= From: Ivan Radovanovic Message-ID: <577C0E2B.5020602@gmail.com> Date: Tue, 5 Jul 2016 21:44:43 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-mono@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Mono and C# applications on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2016 19:44:49 -0000 On 07/05/2016 18:06, Russell Haley wrote: > > The rub with GitHub is that > there is no way to auto-magically keep a fork up to date, meaning as > soon as you create a fork and apply patches, it becomes possible to > get out of date without manual updates. That means it becomes the > teams job to make sure we keep our repositories current (or get all > patches pushed upstream). > > So, there are three ways that I know of to sync your changes *assuming > they under git currently*: > 1) via pull requests > 2) via raw patches > 3) switching the remote origin, pulling the changes, then switching again (?) > > I have to go now, so let us know where your changes are. I'm not sure > if you can create pull requests between forks of the same repo, it > will be neat to try. If you are unfamiliar with pushing your changes > back to your remote repository, I always used this: > > https://rogerdudler.github.io/git-guide/ > My idea of doing this was something like this (I am much less familiar with github): $ git clone url-to-mono-rep $ git checkout branch-4.4 $ git branch freebsd $ git checkout freebsd ... doing some work ... $ git remote add freebsd url-to-our-rep $ git push freebsd freebsd # pushing freebsd branch to our repo for pulling new development from mono $ git checkout master $ git pull origin master merging mono changes with ours $ git checkout freebsd $ git merge master (warning: high probability that I made some mistake with git commands above) In addition to this "freebsd" branch we should have one more stable branch, which would require code to be reviewed to reach it. P.S. I got invite for github (thanks Russ!), I will first test how to push this with some dummy remote I will create (in my experience mistaken commits to central repository can be annoying to fix).