[Soc-2013-dev] Weekly Report #3: Cycles Motion Blur

[Gavin Howard]

All,

First of all, David, I managed to get it building. Like you said, I
had to clean out the entire branch. I ended up checking out trunk in
one folder and checking out my branch in another. Then I copied the
contents of trunk (excluding the .svn folder) to the branch directory,
built it, and committed it.

I will be going back through bf-blender-cvs archives to re-apply some
of the work I already did. Otherwise, I am starting from scratch
again, which may not be a bad thing. However, I will probably to all
conflict resolution by hand from now on.

Gavin Howard

On Fri, Jul 5, 2013 at 12:29 AM, David Jeske <davidj at gmail.com> wrote:
> On Thu, Jul 4, 2013 at 11:14 PM, Gavin Howard <gavin.d.howard at gmail.com>
> wrote:
>>
>> ==== Questions ====
>>
>> Do any of the developers know what I might have done wrong in my
>> merging? I can't figure it out. If there are conflicts, I resolve them
>> with either "theirs-full" or "theirs-conflict". If there are any
>> suggestions, please let me know.
>
>
> Hard to answer without digging into details.... One thing you can do is ask
> for a patch from your head to the trunk-head, create a clean branch-state,
> then hand-apply the diffs, not adding anything that doesn't look like your
> work. This will help fix any mis-merging while recovering useful code if
> there is some... THen you can pick up the pieces. Usually it's much faster
> to make the same code changes again, so this may-or-may-not be useful
> depending on the work involved.
>
> _______________________________________________
> Soc-2013-dev mailing list
> Soc-2013-dev at blender.org
> http://lists.blender.org/mailman/listinfo/soc-2013-dev
>