Revision 666534336537 () - Diff

Link to this snippet: https://friendpaste.com/5OF1G9hF8TJWvB0PDnlpyu
Embed:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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".