I fail to see how anyone's time (LL devs included) is more or less valuable
during the upcoming holidays.
You can work this through to diff using hg by:
clone the sunshine repo.
find the point of first sunshine commit.
update to it
give it a sunshine bookmark or branch. doesn't matter which
update to tip and do a dummy commit (may not be needed)
clone viewer-development
pull the sunshine branch into v-d do not update or merge the branch
hg graft the beginning to end sunshine branch change sets
resolve the merges as you go
once done the sunshine branch will be re-based to the front of v-d
change the phase of all the cs, if not allready, to draft
import all to mq
un-apply all but first
fold all the un-applied to the first
export a patch/diff.
this is more or less the procedure i have used to cherry pick.
>________________________________
> From: Henri Beauchamp <sl...@free.fr>
>To: opensource-dev@lists.secondlife.com
>Sent: Monday, December 17, 2012 9:54 AM
>Subject: Re: [opensource-dev] Upcoming server side avatar baking
>
>On Mon, 17 Dec 2012 05:35:06 -0800 (PST), Nicky Perian wrote:
>
>> Henri
>> I was able to merge and build and verify kokua on aditi; the top 2 commits
>> are post merge tweaks. I don't know if that can help diff wise but, feel
>> free to use.
>> The last upstream merge to kokua was viewer-release, last Monday's merge.
>> Nicky
>> https://bitbucket.org/NickyP/kokua-sunshine-external/overview
>
>I'm afraid it doesn't help. What I need to avoid wasting my little
>free time in this period of the year, is a clean diff with only the
>*relevant*, *minimal* changes in it.
>
>The fact you could merge the sunshine branch with another v3-based
>viewer doesn't help (you simply merged stuff that is still not
>validated/adopted/committed to the viewer-development and viewer-beta
>banches together the (soon) mandatory server side baking code).
>
>Regards,
>
>Henri.
>_______________________________________________
>Policies and (un)subscribe information available here:
>http://wiki.secondlife.com/wiki/OpenSource-Dev
>Please read the policies before posting to keep unmoderated posting privileges
>
>
>
_______________________________________________
Policies and (un)subscribe information available here:
http://wiki.secondlife.com/wiki/OpenSource-Dev
Please read the policies before posting to keep unmoderated posting privileges
