Create releases/2.0 as a straight copy of branches/farewellSwt@6272
svn cp https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt \
https://google-web-toolkit.googlecode.com/svn/releases/2.0
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.0@6274 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt
index 7843c61..5d5ecba 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -1,9 +1,19 @@
-Created as a straight copy of branches/farewellSwt@6267
+Created from trunk@6101
========================
-svn cp https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt \
- https://google-web-toolkit.googlecode.com/svn/releases/2.0
+svn copy -r6226 \
+ https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt \
+ https://google-web-toolkit.googlecode.com/svn/changes/jat/noswt-merge6200
-Merged from farewellSwt
+Merged from trunk
================
-svn merge https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt \
- --ignore-ancestry -r6267:6271 .
+svn merge https://google-web-toolkit.googlecode.com/svn/trunk \
+ -r6101:6142
+svn merge --ignore-ancestry -r6142:6200 \
+ https://google-web-toolkit.googlecode.com/svn/trunk
+ (via changes/jat/noswt-merge6200)
+svn merge https://google-web-toolkit.googlecode.com/svn/trunk \
+ -r6200:6239 .
+svn merge https://google-web-toolkit.googlecode.com/svn/trunk \
+ -r6239:6249 .
+svn merge https://google-web-toolkit.googlecode.com/svn/trunk \
+ --ignore-ancestry -r6249:6270 .
