On Thu, Dec 11, 2008 at 1:33 PM, Bruce Johnson <br...@google.com> wrote:
> @Scott: Blame me. I asked Freeland to take this approach because we are > still urgently trying to stabilize the trunk. We'll knowingly suffer the > cost of a yuckier merge, but we definitely can't take any chance of > additional breakages. Scott's suggestion accomplishes the same thing (and was perhaps how the diff was generated to start with), but specifically merges the particular changes into a working copy preserving the history rather than duplicating the changes. -- John A. Tamplin Software Engineer (GWT), Google --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---