[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [sup-devel] What's your workflow?

To: sup-devel <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] What's your workflow?
From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 29 Dec 2009 14:51:12 -0800
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
Delivered-to: eg@gaute.vetsj.com
Delivered-to: sup-devel@rubyforge.org
In-reply-to: <1262123514-sup-7661@tilus.net>
List-archive: <http://rubyforge.org/pipermail/sup-devel>
List-help: <mailto:sup-devel-request@rubyforge.org?subject=help>
List-id: Sup developer discussion <sup-devel.rubyforge.org>
List-post: <mailto:sup-devel@rubyforge.org>
List-subscribe: <http://rubyforge.org/mailman/listinfo/sup-devel>, <mailto:sup-devel-request@rubyforge.org?subject=subscribe>
List-unsubscribe: <http://rubyforge.org/mailman/options/sup-devel>, <mailto:sup-devel-request@rubyforge.org?subject=unsubscribe>
References: <1262114695-sup-9446@tilus.net> <1262116690-sup-8655@masanjin.net> <1262117270-sup-1009@tilus.net> <1262118240-sup-4202@ntdws12.chass.utoronto.ca> <1262123514-sup-7661@tilus.net>
Reply-to: Sup developer discussion <sup-devel@rubyforge.org>
Sender: sup-devel-bounces@rubyforge.org
User-agent: Sup/git

Reformatted excerpts from Tero Tilus's message of 2009-12-29:
> Does it "just work" if I have feature branches off of master which are
> merged to mybranch and the feature patches get accepted and appear to
> next?

It certainly works for the case where you're merging from next into your
daily_sup branch, and rebase will happily drop changes that are
duplicated by the target, so I would guess that rebase would do the
right thing with redundant merges. Maybe a test is in order!
-- 
William <wmorgan-sup@masanjin.net>
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel

Follow-Ups:
- Re: [sup-devel] What's your workflow?
  - From: Tero Tilus <tero@tilus.net>

References:
- [sup-devel] What's your workflow?
  - From: Tero Tilus <tero@tilus.net>
- Re: [sup-devel] What's your workflow?
  - From: William Morgan <wmorgan-sup@masanjin.net>
- Re: [sup-devel] What's your workflow?
  - From: Tero Tilus <tero@tilus.net>
- Re: [sup-devel] What's your workflow?
  - From: Ben Walton <bwalton@artsci.utoronto.ca>
- Re: [sup-devel] What's your workflow?
  - From: Tero Tilus <tero@tilus.net>

Prev by Date: Re: [sup-devel] What's your workflow?
Next by Date: Re: [sup-devel] What's your workflow?
Previous by thread: Re: [sup-devel] What's your workflow?
Next by thread: Re: [sup-devel] What's your workflow?
Index(es):
- Date
- Thread