[opensource-dev] Upcoming server side avatar baking

[Henri Beauchamp]

On Mon, 17 Dec 2012 09:18:04 -0800 (PST), Nicky Perian wrote:

> 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.

Excepted that:
1.- the initial sunchine repo (from which the server baking branch was
    forked: sunshine-internal ?) is not public;
2.- the first changes happened months ago and now that sunshine-external
    was merged with viewer-develompent, it becomes impossible to
    distinguish what commit was applied to what branch (repos are a
    mess ! I always hated them !);
3.- I don't have the time to browse some 850+ pages of commits to see
    when and which commit is relevant to the new code or not (it would
    be simpler and faster for me to clean up by hand the diff between
    viewer-develompent and sunshine-external) !

It would be MUCH simpler for LL to just clone the original repo (*they*
know when the repo was branched and what was the first commit to it),
merge the viewer-development commits into it (the same commits they
merged in the sunshine-external repo) and make the clone public.
I would then just download the sources for that clone and diff it with
sunshine-external: done !  All changes at hand in a single diff, and
all relevant to the actual task at hand.

Henri.