On Thu, Sep 11, 2014 at 12:09 PM, Nico Williams
wrote:
> On Thu, Sep 11, 2014 at 11:01 AM, Richard Hipp wrote:
> > On Thu, Sep 11, 2014 at 11:50 AM, Nico Williams
> > wrote:
> >>
> >> On Wed, Sep 10, 2014 at 10:47 PM, Richard Hipp
> >> > On the few cases when this has happened to me, I've move
On Thu, Sep 11, 2014 at 11:01 AM, Richard Hipp wrote:
> On Thu, Sep 11, 2014 at 11:50 AM, Nico Williams
> wrote:
>>
>> On Wed, Sep 10, 2014 at 10:47 PM, Richard Hipp
>> > On the few cases when this has happened to me, I've moved "goof" into a
>> > new
>> > branch (typically "mistake") then cherr
On Thu, Sep 11, 2014 at 11:50 AM, Nico Williams
wrote:
> On Wed, Sep 10, 2014 at 10:47 PM, Richard Hipp
> > On the few cases when this has happened to me, I've moved "goof" into a
> new
> > branch (typically "mistake") then cherry pick the follow-on check-ins
> back
> > over to trunk, assuming t
On Wed, Sep 10, 2014 at 10:47 PM, Richard Hipp wrote:
> On Wed, Sep 10, 2014 at 10:48 PM, Matt Welland wrote:
>> On Wed, Sep 10, 2014 at 5:12 PM, Richard Hipp wrote:
>>> Sometimes we will make a check-in to trunk then later decide it doesn't
>>> belong there, so then move it into a branch. (
>>
On Wed, Sep 10, 2014 at 8:47 PM, Richard Hipp wrote:
>
>
> On Wed, Sep 10, 2014 at 10:48 PM, Matt Welland
> wrote:
>
>>
>> On Wed, Sep 10, 2014 at 5:12 PM, Richard Hipp wrote:
>>
>>> Sometimes we will make a check-in to trunk then later decide it doesn't
>>> belong there, so then move it into a
On Wed, Sep 10, 2014 at 10:48 PM, Matt Welland wrote:
>
> On Wed, Sep 10, 2014 at 5:12 PM, Richard Hipp wrote:
>
>> Sometimes we will make a check-in to trunk then later decide it doesn't
>> belong there, so then move it into a branch. (
>
>
> Isn't this only possible if no further commits have
On Wed, Sep 10, 2014 at 5:12 PM, Richard Hipp wrote:
> Sometimes we will make a check-in to trunk then later decide it doesn't
> belong there, so then move it into a branch. (
Isn't this only possible if no further commits have been made on the trunk?
I suppose one possible "fix" if there have
Thanks, Richard! I really appreciate the detailed response. Many of the
practices you describe, I am already following such as tagging each
release with both release and the version number. It makes things really
easy when going back to fix bugs, answer support queries about the given
version e
On Wed, Sep 10, 2014 at 7:50 PM, Philip Bennefall
wrote:
> Hi all,
>
> I have a question about how to properly use branches in the following
> scenario:
>
> I have version 1.0 of my software, which is stable. Then I want to start
> developing version 2. Initially I make a version2 branch where al
Hi all,
I have a question about how to properly use branches in the following
scenario:
I have version 1.0 of my software, which is stable. Then I want to start
developing version 2. Initially I make a version2 branch where all
development happens, while at the same time I continue to mainta
10 matches
Mail list logo