[google-web-toolkit commit] r3740 - in releases: 1.5 1.6
codesite...@google.com
Date: Fri Oct 10 16:14:30 2008
New Revision: 3740
Modified:
releases/1.5/branch-info.txt
releases/1.6/branch-info.txt
Log:
Recording merge statuses.
Modified: releases/1.5/branch-info.txt
==============================================================================
--- releases/1.5/branch-info.txt (original)
+++ releases/1.5/branch-info.txt Fri Oct 10 16:14:30 2008
@@ -33,7 +33,7 @@
/releases/1.5/@r3556:3587 was merged (r3593) into /trunk/
/releases/1.5/@r3587:3629 was merged (r3630) into /trunk/
/trunk c3708 was merged (r3714) into this branch.
----> The next merge into trunk will be 3630:????, skipping r3714
+---> The next merge into /releases/1.6 will be 3630:3713+3714:HEAD,
skipping r3714
Changes in this branch (excluding changes to this file itself):
- Fixed random JUnit timeouts occurring on module transition. (r2941)
Modified: releases/1.6/branch-info.txt
==============================================================================
--- releases/1.6/branch-info.txt (original)
+++ releases/1.6/branch-info.txt Fri Oct 10 16:14:30 2008
@@ -6,4 +6,6 @@
/releases/1.6/ was created (r3732) as a straight copy from /trunk/@r3683
Merges:
----> The next merge into trunk is not yet determined, we will need to skip
a few revisions to first back-port changes from trunk.
+/trunk revisions c3688,c3703,c3700,c3704,c3707,c3715,c3717,c3724,3725 were
merged (r3739) into this branch
+
+---> The next merge into trunk will be 3739:HEAD