On Thu, Dec 20, 2012 at 10:56 AM, Henri Beauchamp <sl...@free.fr> wrote: > On Thu, 20 Dec 2012 00:03:03 -0800 (PST), Nicky Perian wrote: > >> I decided to put some walk with my rather cheap talk. >> Here is a repackaged server side avatar baking repository. >> https://bitbucket.org/NickyP/viewer-development-sunshine-diff/overview > > I'm afraid it didn't work... The diff I get with viewer-development > is still 2Mb big and includes many irrelevant changes such as UI code > refactoring, path finding tools changes, etc, etc, etc... > > No need to waste your time any more, anyway, since I wasted mine > yesterday to clean up the 2Mb diff (which is now only 1.4Mb big, > i.e. 40% of the changes in sunshine-external are unrelated to the > new server-side baking code !). > > If anyone wants this cleaned-up diff, let me know and I'll send it to > you. > > Regards, > > Henri.
Why are you folks not doing something like this? 1. hg clone viewer-dev 2. change to the viewer-dev folder 3. 'hg pull https://hg.secondlife.com/sunshine-external' 4. hg merge 5. clean up the 3-way diff of llviewerversion.h 6. hg diff > foo.diff The result is a 356k large foo.diff file that's much easier to clean up than a 2 mb monstrosity. --Chalice Yao _______________________________________________ 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
