You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-dev@db.apache.org by Oy...@Sun.COM on 2005/10/28 15:59:32 UTC
HEADS UP: DERBY-330 commit is huge (was: Re: [VOTE] 10.1.2.0 release)
Oyvind.Bakksjo@Sun.COM wrote:
> Kathey Marsden wrote:
>>
>> Are you volunteering?
>
>
> Sure, I can do that. Just hope nobody will complain - as I understand
> it, doing the whole DERBY-330 thing potentially creates a huge diff,
> which may cause conflicts when other developers update with local
> modifications. But I suspect there will never be a Good Time to do this.
>
> I think I'll just fix the scripts first.
So I did the scripts in one commit, and now I've done the rest. Sorry if
all you get to do today is run 'svn update'... Like I said, probably
never a good time to do this, except it should have been done at the
very beginning of this repository.
Transmitting file data
.........................................................................................................................................................................................................................
Committed revision 329187.
Any chocolate for contributing the largest patch? ;o)
--
Oyvind Bakksjo
Sun Microsystems, Database Technology Group
Trondheim, Norway
http://weblogs.java.net/blog/bakksjo/
Re: HEADS UP: DERBY-330 commit is huge
Posted by Andrew McIntyre <mc...@gmail.com>.
On 10/28/05, Daniel John Debrunner <dj...@debrunners.com> wrote:
> Andrew McIntyre wrote:
> > From the top of the tree:
> >
> > svn up -r 329186
> > svn diff > my.patch
> > svn revert -R *
> > svn up
> > patch -p0 < my.patch
> >
> > No warranties, expressed or implied. Use at your own risk, make a
> > backup (or patch a different view) if you're really worried, etc. :-)
>
> That seemed like a great idea, but didn't work for me. :-(
>
> With just the svn update I had only one file in conflict.
>
> Then following Andrew's steps (as a test), the patch failed on most of
> my modified files.
>
> Your mileage may vary ...
>
> Now see if I can go back (again) to 329186 and apply my patch ...
Is the patch failing because of diffs in whitespace or eol characters?
If you're using Gnu patch, try the -l flag patch to ignore whitespace
(including, I believe, the specific eol characters used) when
attempting to match patterns.
andrew
Re: HEADS UP: DERBY-330 commit is huge
Posted by Daniel John Debrunner <dj...@debrunners.com>.
Andrew McIntyre wrote:
>
> On Oct 28, 2005, at 12:06 PM, Daniel John Debrunner wrote:
>
>> Oyvind.Bakksjo@Sun.COM wrote:
>>
>>>
>>> Committed revision 329187.
>>>
>>> Any chocolate for contributing the largest patch? ;o)
>>>
>>
>> Are you offering chocolate for messing up our codelines? :-)
>>
>> I know there's probably never a good time to do something like this, but
>> some advance warning is really helpful. That allows developers some
>> chance to minimize the number of changes in thier client. Pick a Sunday
>> at least ten days away, and provide reminders during the week before.
>
>
> For anyone that synced up to 329187 and now has a bunch of merge
> conflicts (state 'C' in svn stat) sitting in your view, you should be
> able to patch yourself and be back in order. From the top of the tree:
>
> svn up -r 329186
> svn diff > my.patch
> svn revert -R *
> svn up
> patch -p0 < my.patch
>
> No warranties, expressed or implied. Use at your own risk, make a
> backup (or patch a different view) if you're really worried, etc. :-)
That seemed like a great idea, but didn't work for me. :-(
With just the svn update I had only one file in conflict.
Then following Andrew's steps (as a test), the patch failed on most of
my modified files.
Your mileage may vary ...
Now see if I can go back (again) to 329186 and apply my patch ...
Dan.
Re: HEADS UP: DERBY-330 commit is huge
Posted by Andrew McIntyre <mc...@gmail.com>.
On Oct 28, 2005, at 12:06 PM, Daniel John Debrunner wrote:
> Oyvind.Bakksjo@Sun.COM wrote:
>>
>> Committed revision 329187.
>>
>> Any chocolate for contributing the largest patch? ;o)
>>
>
> Are you offering chocolate for messing up our codelines? :-)
>
> I know there's probably never a good time to do something like
> this, but
> some advance warning is really helpful. That allows developers some
> chance to minimize the number of changes in thier client. Pick a
> Sunday
> at least ten days away, and provide reminders during the week before.
For anyone that synced up to 329187 and now has a bunch of merge
conflicts (state 'C' in svn stat) sitting in your view, you should be
able to patch yourself and be back in order. From the top of the tree:
svn up -r 329186
svn diff > my.patch
svn revert -R *
svn up
patch -p0 < my.patch
No warranties, expressed or implied. Use at your own risk, make a
backup (or patch a different view) if you're really worried, etc. :-)
andrew
Re: HEADS UP: DERBY-330 commit is huge
Posted by Daniel John Debrunner <dj...@debrunners.com>.
Oyvind.Bakksjo@Sun.COM wrote:
> Oyvind.Bakksjo@Sun.COM wrote:
>> Sure, I can do that. Just hope nobody will complain - as I understand
>> it, doing the whole DERBY-330 thing potentially creates a huge diff,
>> which may cause conflicts when other developers update with local
>> modifications. But I suspect there will never be a Good Time to do this.
>>
>> I think I'll just fix the scripts first.
>
>
> So I did the scripts in one commit, and now I've done the rest. Sorry if
> all you get to do today is run 'svn update'... Like I said, probably
> never a good time to do this, except it should have been done at the
> very beginning of this repository.
>
> Transmitting file data
> .........................................................................................................................................................................................................................
>
> Committed revision 329187.
>
> Any chocolate for contributing the largest patch? ;o)
Are you offering chocolate for messing up our codelines? :-)
I know there's probably never a good time to do something like this, but
some advance warning is really helpful. That allows developers some
chance to minimize the number of changes in thier client. Pick a Sunday
at least ten days away, and provide reminders during the week before.
Thanks for doing this though,
Dan.
Re: HEADS UP: DERBY-330 commit is huge (was: Re: [VOTE] 10.1.2.0
release)
Posted by Knut Anders Hatlen <Kn...@Sun.COM>.
Oyvind.Bakksjo@Sun.COM writes:
> Oyvind.Bakksjo@Sun.COM wrote:
>> Kathey Marsden wrote:
>>>
>>> Are you volunteering?
>> Sure, I can do that. Just hope nobody will complain - as I
>> understand it, doing the whole DERBY-330 thing potentially creates a
>> huge diff, which may cause conflicts when other developers update
>> with local modifications. But I suspect there will never be a Good
>> Time to do this.
>> I think I'll just fix the scripts first.
>
> So I did the scripts in one commit, and now I've done the rest. Sorry
> if all you get to do today is run 'svn update'... Like I said,
> probably never a good time to do this, except it should have been done
> at the very beginning of this repository.
>
> Transmitting file data
> .........................................................................................................................................................................................................................
> Committed revision 329187.
>
> Any chocolate for contributing the largest patch? ;o)
While you're at it, could you go through all java files and fix the
different formatting. I'm thinking about tabs vs spaces for
indentation and tabs=4spaces vs tabs=8spaces. Of course, I could write
an emacs mode for autodetecting the indentation style...
Oh, I forgot the smiley! ;)
--
Knut Anders
Re: HEADS UP: DERBY-330 commit is huge
Posted by Oy...@Sun.COM.
Dyre.Tjeldvoll@Sun.COM wrote:
> Oyvind.Bakksjo@Sun.COM writes:
>
>>So I did the scripts in one commit, and now I've done the rest. Sorry if
>>all you get to do today is run 'svn update'... Like I said, probably
>>never a good time to do this, except it should have been done at the
>>very beginning of this repository.
>>
>>Transmitting file data
>>.........................................................................................................................................................................................................................
>>Committed revision 329187.
>
>
> Does that mean that I can close and resolve DERBY-330?
Yes.
--
Oyvind Bakksjo
Sun Microsystems, Database Technology Group
Trondheim, Norway
http://weblogs.java.net/blog/bakksjo/
Re: HEADS UP: DERBY-330 commit is huge
Posted by Dy...@Sun.COM.
Oyvind.Bakksjo@Sun.COM writes:
> Oyvind.Bakksjo@Sun.COM wrote:
>> Kathey Marsden wrote:
>>>
>>> Are you volunteering?
>> Sure, I can do that. Just hope nobody will complain - as I
>> understand it, doing the whole DERBY-330 thing potentially creates a
>> huge diff, which may cause conflicts when other developers update
>> with local modifications. But I suspect there will never be a Good
>> Time to do this.
>> I think I'll just fix the scripts first.
>
> So I did the scripts in one commit, and now I've done the rest. Sorry if
> all you get to do today is run 'svn update'... Like I said, probably
> never a good time to do this, except it should have been done at the
> very beginning of this repository.
>
> Transmitting file data
> .........................................................................................................................................................................................................................
> Committed revision 329187.
Does that mean that I can close and resolve DERBY-330?
--
dt