You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by Willem Jiang <wi...@gmail.com> on 2009/01/16 05:11:15 UTC

Can we block the versions those we don't want to merge into camel-1.x branch ?

Hi Camel riders,

If you run svnmerge.py avail in camel-1.x branch, you will find there
are hundred of version numbers printed out.
I don't know if we missed some versions which need to be merged into
camel-1.x branch.
I'd like to run svnmerge.py block to block the versions which we just
want to stay in camel trunk, but it's huge work.
Is there any good idea to do that in a easy way ?

Thanks,

Willem

Re: Can we block the versions those we don't want to merge into camel-1.x branch ?

Posted by Jon Anstey <ja...@gmail.com>.
On Tue, Jan 20, 2009 at 6:19 AM, Willem Jiang <wi...@gmail.com>wrote:

> Hi Jon,
>
> If you want to go through the version's log to make sure it is not the
> version which we want to merge into camel-1.x branch. That will be a
> huge work.


Yeah, makes sense now.


>
>
> But if we just make assumption that all the patch for camel-1.x are
> merged, the blocking thing could be much easy.
>
> Anyway, it's good to hear we can unblock them if we want.


So I guess we should just go for it if no one else objects.


>
>
> BTW, I should say congratulation to be a father to you ;)


Thanks! :)


>
>
> Willem
>
> Jon Anstey wrote:
> > Hold on, you said its a huge piece of work...  You know you can just pass
> in
> > the big list of revisions to the block command right? Something like
> >
> > svnmerge.py block -r
> >
> 709613,709635,711586,711642,711677,711750,711926,712093,712133,712165..............
> >
> > Maybe I'm just not understanding due to baby induced sleep deprivation :)
> >
> > On Mon, Jan 19, 2009 at 2:04 PM, Jon Anstey <ja...@gmail.com> wrote:
> >
> >> We can probably just block anything thats more than a week old; you
> >> shouldn't need to manually check through each commit IMO. We usually
> merge
> >> fixes immediately to the 1-x branch anyways. Also, we can always just
> >> unblock revisions that we need in the future.
> >>
> >> On Fri, Jan 16, 2009 at 12:41 AM, Willem Jiang <willem.jiang@gmail.com
> >wrote:
> >>
> >>> Hi Camel riders,
> >>>
> >>> If you run svnmerge.py avail in camel-1.x branch, you will find there
> >>> are hundred of version numbers printed out.
> >>> I don't know if we missed some versions which need to be merged into
> >>> camel-1.x branch.
> >>> I'd like to run svnmerge.py block to block the versions which we just
> >>> want to stay in camel trunk, but it's huge work.
> >>> Is there any good idea to do that in a easy way ?
> >>>
> >>> Thanks,
> >>>
> >>> Willem
> >>>
> >>
> >>
> >> --
> >> Cheers,
> >> Jon
> >>
> >> http://janstey.blogspot.com/
> >>
> >
> >
> >
>
>


-- 
Cheers,
Jon

http://janstey.blogspot.com/

Re: Can we block the versions those we don't want to merge into camel-1.x branch ?

Posted by Willem Jiang <wi...@gmail.com>.
Hi Jon,

If you want to go through the version's log to make sure it is not the
version which we want to merge into camel-1.x branch. That will be a
huge work.

But if we just make assumption that all the patch for camel-1.x are
merged, the blocking thing could be much easy.

Anyway, it's good to hear we can unblock them if we want.

BTW, I should say congratulation to be a father to you ;)

Willem

Jon Anstey wrote:
> Hold on, you said its a huge piece of work...  You know you can just pass in
> the big list of revisions to the block command right? Something like
> 
> svnmerge.py block -r
> 709613,709635,711586,711642,711677,711750,711926,712093,712133,712165..............
> 
> Maybe I'm just not understanding due to baby induced sleep deprivation :)
> 
> On Mon, Jan 19, 2009 at 2:04 PM, Jon Anstey <ja...@gmail.com> wrote:
> 
>> We can probably just block anything thats more than a week old; you
>> shouldn't need to manually check through each commit IMO. We usually merge
>> fixes immediately to the 1-x branch anyways. Also, we can always just
>> unblock revisions that we need in the future.
>>
>> On Fri, Jan 16, 2009 at 12:41 AM, Willem Jiang <wi...@gmail.com>wrote:
>>
>>> Hi Camel riders,
>>>
>>> If you run svnmerge.py avail in camel-1.x branch, you will find there
>>> are hundred of version numbers printed out.
>>> I don't know if we missed some versions which need to be merged into
>>> camel-1.x branch.
>>> I'd like to run svnmerge.py block to block the versions which we just
>>> want to stay in camel trunk, but it's huge work.
>>> Is there any good idea to do that in a easy way ?
>>>
>>> Thanks,
>>>
>>> Willem
>>>
>>
>>
>> --
>> Cheers,
>> Jon
>>
>> http://janstey.blogspot.com/
>>
> 
> 
> 


Re: Can we block the versions those we don't want to merge into camel-1.x branch ?

Posted by Jon Anstey <ja...@gmail.com>.
Hold on, you said its a huge piece of work...  You know you can just pass in
the big list of revisions to the block command right? Something like

svnmerge.py block -r
709613,709635,711586,711642,711677,711750,711926,712093,712133,712165..............

Maybe I'm just not understanding due to baby induced sleep deprivation :)

On Mon, Jan 19, 2009 at 2:04 PM, Jon Anstey <ja...@gmail.com> wrote:

> We can probably just block anything thats more than a week old; you
> shouldn't need to manually check through each commit IMO. We usually merge
> fixes immediately to the 1-x branch anyways. Also, we can always just
> unblock revisions that we need in the future.
>
> On Fri, Jan 16, 2009 at 12:41 AM, Willem Jiang <wi...@gmail.com>wrote:
>
>> Hi Camel riders,
>>
>> If you run svnmerge.py avail in camel-1.x branch, you will find there
>> are hundred of version numbers printed out.
>> I don't know if we missed some versions which need to be merged into
>> camel-1.x branch.
>> I'd like to run svnmerge.py block to block the versions which we just
>> want to stay in camel trunk, but it's huge work.
>> Is there any good idea to do that in a easy way ?
>>
>> Thanks,
>>
>> Willem
>>
>
>
>
> --
> Cheers,
> Jon
>
> http://janstey.blogspot.com/
>



-- 
Cheers,
Jon

http://janstey.blogspot.com/

Re: Can we block the versions those we don't want to merge into camel-1.x branch ?

Posted by Jon Anstey <ja...@gmail.com>.
We can probably just block anything thats more than a week old; you
shouldn't need to manually check through each commit IMO. We usually merge
fixes immediately to the 1-x branch anyways. Also, we can always just
unblock revisions that we need in the future.

On Fri, Jan 16, 2009 at 12:41 AM, Willem Jiang <wi...@gmail.com>wrote:

> Hi Camel riders,
>
> If you run svnmerge.py avail in camel-1.x branch, you will find there
> are hundred of version numbers printed out.
> I don't know if we missed some versions which need to be merged into
> camel-1.x branch.
> I'd like to run svnmerge.py block to block the versions which we just
> want to stay in camel trunk, but it's huge work.
> Is there any good idea to do that in a easy way ?
>
> Thanks,
>
> Willem
>



-- 
Cheers,
Jon

http://janstey.blogspot.com/