You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@couchdb.apache.org by Benoit Chesneau <bc...@gmail.com> on 2012/11/27 04:42:33 UTC
1.3.x vs master
It was my understanding that everything that goes in 1.3 should go in
the master as well in the current workflow. But this is clearly not
the case:
https://github.com/benoitc/couchdb/compare/master...1.3.x
I don't see any reason for this right now. Is this OK to merge?
- benoît
Re: 1.3.x vs master
Posted by Robert Newson <rn...@apache.org>.
We owe Jan a review of his work on
https://issues.apache.org/jira/browse/COUCHDB-1585 before we can pick it
onto the 1.3.x branch.
The other missing commit is 5d4ef93048f4aca24bef00fb5b2c13c54c2bbbb3 which
is a refinement of the fix for COUCHDB-1607. I think it's fine to cherry
pick but would like a quick review anyway.
On 27 November 2012 09:44, Robert Newson <rn...@apache.org> wrote:
> For now, I'm just cherry picking the things that are missing.
>
>
> On 27 November 2012 09:40, Benoit Chesneau <bc...@gmail.com> wrote:
>
>> On Tue, Nov 27, 2012 at 10:13 AM, Robert Newson <rn...@apache.org>
>> wrote:
>> > There are changes that should be in master only, merging must not
>> happen.
>> >
>> > There are some missing items on master, though, like the CHANGES change
>> to
>> > describe the server UUID. I'll take care of it.
>> >
>> >
>>
>> Bad linking sorry. Also by merge i meant rebase or whatever :)
>>
>> - benoit
>>
>
>
Re: 1.3.x vs master
Posted by Robert Newson <rn...@apache.org>.
For now, I'm just cherry picking the things that are missing.
On 27 November 2012 09:40, Benoit Chesneau <bc...@gmail.com> wrote:
> On Tue, Nov 27, 2012 at 10:13 AM, Robert Newson <rn...@apache.org>
> wrote:
> > There are changes that should be in master only, merging must not happen.
> >
> > There are some missing items on master, though, like the CHANGES change
> to
> > describe the server UUID. I'll take care of it.
> >
> >
>
> Bad linking sorry. Also by merge i meant rebase or whatever :)
>
> - benoit
>
Re: 1.3.x vs master
Posted by Benoit Chesneau <bc...@gmail.com>.
On Tue, Nov 27, 2012 at 10:13 AM, Robert Newson <rn...@apache.org> wrote:
> There are changes that should be in master only, merging must not happen.
>
> There are some missing items on master, though, like the CHANGES change to
> describe the server UUID. I'll take care of it.
>
>
Bad linking sorry. Also by merge i meant rebase or whatever :)
- benoit
Re: 1.3.x vs master
Posted by Robert Newson <rn...@apache.org>.
There are changes that should be in master only, merging must not happen.
There are some missing items on master, though, like the CHANGES change to
describe the server UUID. I'll take care of it.
On 27 November 2012 03:42, Benoit Chesneau <bc...@gmail.com> wrote:
> It was my understanding that everything that goes in 1.3 should go in
> the master as well in the current workflow. But this is clearly not
> the case:
>
> https://github.com/benoitc/couchdb/compare/master...1.3.x
>
> I don't see any reason for this right now. Is this OK to merge?
>
> - benoît
>