Fixed URL to ManagingMerges + added some more notes.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4466 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt
index 60cfc59..981c861 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -1,6 +1,6 @@
branch-info.txt for GWT 1.6 release:
Tracks interactions between this branch and other branches.
-See: http://code.google.com/p/google-web-toolkit/wiki/ManagingMerge
+See: http://code.google.com/p/google-web-toolkit/wiki/ManagingMerges
Copies:
/releases/1.6/ was created (r3732) as a straight copy from /trunk/@r3683
@@ -19,16 +19,15 @@
/releases/1.6/@c4269, c4298, and c4299 were merged (r4314) into trunk; note this is a cherrypick
/trunk revision c4266 was merged (r4321) into this branch
/releases/1.6/@r4198:4268 was merged (r4367,r4368) into trunk
-/releases/1.6/@r4269:4297 was merged (r4367,r4368) into trunk
-/releases/1.6/@r4299:4320 was merged (r4367,r4368) into trunk
-/releases/1.6/@r4321:4366 was merged (r4367,r4368) into trunk
+/releases/1.6/@r4269:4297 was merged (r4367,r4368) into trunk, skipping c4269 (already merged, c4314)
+/releases/1.6/@r4299:4320 was merged (r4367,r4368) into trunk, skipping c4298, c4299 (already merged, c4314)
+/releases/1.6/@r4321:4366 was merged (r4367,r4368) into trunk, skipping c4321 (was a backmerge from trunk)
/releases/1.6/@r4366:4385 was merged (r4386) into trunk
The next merge into trunk will be:
svn merge -r4385:4459 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
-svn merge -r4459:4460 https://google-web-toolkit.googlecode.com/svn/releases/1.6 . (will have failed parts)
-svn merge -r4460:? https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
-
+svn merge -c4460 https://google-web-toolkit.googlecode.com/svn/releases/1.6 . (will have failed parts)
+svn merge -r4460:???? https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
Patches that will not merge cleanly:
4460 (get help from spoon or scottb)
