...ping...

On Tue, Nov 18, 2008 at 12:31 AM, Ray Ryan <[EMAIL PROTECTED]> wrote:

> This is step two of three of committing your event dispatch benchmark. Step
> one was checking the 1.5 version into releases/1.5/reference/dispatch. Now
> I'm merging that into releases/1.6. The third and final step will be a patch
> updating 1.6/reference/dispatch with your event handler changes.
> I'm not sure how one gets a merge reviewed, as svn diff doesn't show the "A
> +" adds. But, FWIW...
>
> I performed the merge thus:
>
>   svn merge -r 3863:4093
> http://google-web-toolkit.googlecode.com/svn/releases/1.5
>
> and saw only the correct files picked up:
>
>   21:28:50> svn st
>   A  +   reference/dispatch
>   A  +   reference/dispatch/client
>   A  +   reference/dispatch/client/Dispatch.java
>   A  +   reference/dispatch/client/Subject.java
>   A  +   reference/dispatch/public
>   A  +   reference/dispatch/public/Dispatch.html
>   A  +   reference/dispatch/Dispatch.gwt.xml
>   M      branch-info.txt
>
> and have updated the branch-info.txt:
>
>   21:24:03> svn diff
>   Index: branch-info.txt
>   ===================================================================
>   --- branch-info.txt (revision 4093)
>   +++ branch-info.txt (working copy)
>   @@ -12,5 +12,6 @@
>    /releases/1.6/@r3878:3944 was merged (r3945) into trunk, skipping c3878
>    /releases/1.6/@r3944:4025 was merged (r????) into trunk
>    /branches/[EMAIL PROTECTED]:4088 was merged (r4092) into this
> branch
>   +/releases/1.5/@r3863:4093 was merged (r????) into this branch
>
>    ---> The next merge into trunk will be 4025:HEAD
>
>

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---

Reply via email to