--- 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 ooasaljebcvb, [url=http://rznjjrfezacs.com/]rznjjrfezacs[/url], [link=http://kttspsyiomuy.com/]kttspsyiomuy[/link], http://vassiwwulvkz.com/