--- Revision None
+++ Revision 666534336537
@@ -0,0 +1,19 @@
+oldsvn -> branch
+
+branch changed
+branch changed
+branch changed
+
+... longtime passed
+
+rm -rf oldsvn; bzr branch httpfoo oldsvn -
+
+
+Now i want to merge branch into old svn:
+cd branch
+bzr merge -rx..y oldsvn
+All changes applied successfully.
+bzr push oldsvn
+bzr: ERROR: These branches have diverged.  Try using "merge" and then "push".
+
+