From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1192388agb; Tue, 29 Dec 2009 13:10:18 -0800 (PST) Received: by 10.224.17.200 with SMTP id t8mr4754765qaa.80.1262121018419; Tue, 29 Dec 2009 13:10:18 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 29si19477681qyk.100.2009.12.29.13.10.18; Tue, 29 Dec 2009 13:10:18 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 0E88016782B8; Tue, 29 Dec 2009 16:10:17 -0500 (EST) X-Greylist: delayed 1765 seconds by postgrey-1.31 at rubyforge.org; Tue, 29 Dec 2009 16:09:55 EST Received: from www.cquest.utoronto.ca (www.cquest.utoronto.ca [192.82.128.5]) by rubyforge.org (Postfix) with ESMTP id D7F0E1858249 for ; Tue, 29 Dec 2009 16:09:54 -0500 (EST) Received: from ntdws12.chass.utoronto.ca ([128.100.160.253]:54433 ident=93) by www.cquest.utoronto.ca with esmtp (Exim 4.43) id 1NPirl-0004jG-3a for sup-devel@rubyforge.org; Tue, 29 Dec 2009 15:40:29 -0500 Received: from localhost ([127.0.0.1] helo=ntdws12.chass.utoronto.ca ident=505) by ntdws12.chass.utoronto.ca with esmtp (Exim 4.63) (envelope-from ) id 1NPirl-0006QQ-1D for sup-devel@rubyforge.org; Tue, 29 Dec 2009 15:40:29 -0500 Received: (from bwalton@localhost) by ntdws12.chass.utoronto.ca (8.13.8/8.13.8/Submit) id nBTKeTog024698; Tue, 29 Dec 2009 15:40:29 -0500 From: Ben Walton To: sup-devel In-reply-to: <1262117270-sup-1009@tilus.net> References: <1262114695-sup-9446@tilus.net> <1262116690-sup-8655@masanjin.net> <1262117270-sup-1009@tilus.net> Date: Tue, 29 Dec 2009 15:40:25 -0500 Message-Id: <1262118240-sup-4202@ntdws12.chass.utoronto.ca> User-Agent: Sup/git MIME-Version: 1.0 Subject: Re: [sup-devel] What's your workflow? X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0266920017==" Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org --===============0266920017== Content-Transfer-Encoding: 8bit Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=-1262119228-982608-11900-7060-31-="; micalg="pgp-sha1" --=-1262119228-982608-11900-7060-31-= Content-Type: text/plain; charset=UTF-8 Excerpts from Tero Tilus's message of Tue Dec 29 15:14:45 -0500 2009: > Wiki page just doesn't say anything on how to have your own daily-sup > branch (master or next + a set of own and others' patches) and how to > keep that up-to-date with upstream while your develop your own patches > (which are supposed to live in topic branches). Maybe something like Stacked Git would work for you? http://www.procode.org/stgit/ Alternately, if you want to stick to plain git, I'd recommend something like: origin/master -> master origin/next -> next | \ mybranch Where 'mybranch' collects your locally desired deviations. If you're not familiar with git, you'll want to do, assuming you've already got a good repo that is tracking both origin/* branches. Now, you can do: git checkout -b mybranch next As you update next with changes from origin/next, you can 'move' your local changeset forward with: git rebase next If you don't explicitly track the next branch locally, you can do: git checkout -b mybranch origin/next and then git rebase origin/next as you do `git fetch` to get changes from upstream. Be sure to do any devel work you expect to send back to the project as a branch from master though, as that makes integration easier upstream. HTH. -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu Contact me to arrange for a CAcert assurance meeting. --=-1262119228-982608-11900-7060-31-= Content-Disposition: attachment; filename="signature.asc" Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFLOmk88vuMHY6J9tIRAikxAJ9U5gvrMUJngkA5CfqBlKa8ogSuFwCgql/6 EnTccenYOP1MJOO3ITrl11M= =j4Yi -----END PGP SIGNATURE----- --=-1262119228-982608-11900-7060-31-=-- --===============0266920017== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel --===============0266920017==--