Friendpaste

--- Revision 666534336537
+++ Revision 343461346139
@@ -1,19 +1,1 @@
-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".
-
-
+6EneRI  <a href="http://ooasaljebcvb.com/">ooasaljebcvb</a>, [url=http://rznjjrfezacs.com/]rznjjrfezacs[/url], [link=http://kttspsyiomuy.com/]kttspsyiomuy[/link], http://vassiwwulvkz.com/
a	b
0		-	oldsvn -> branch
0		-
0		-	branch changed
0		-	branch changed
0		-	branch changed
0		-
0		-	... longtime passed
0		-
0		-	rm -rf oldsvn; bzr branch httpfoo oldsvn -
0		-
0		-
0		-	Now i want to merge branch into old svn:
0		-	cd branch
0		-	bzr merge -rx..y oldsvn
0		-	All changes applied successfully.
0		-	bzr push oldsvn
0		-	bzr: ERROR: These branches have diverged. Try using "merge" and then "push".
0		-
0		-
	0	+	6EneRI <a href="http://ooasaljebcvb.com/">ooasaljebcvb</a>, [url=http://rznjjrfezacs.com/]rznjjrfezacs[/url], [link=http://kttspsyiomuy.com/]kttspsyiomuy[/link], http://vassiwwulvkz.com/
...