0

I once did a repository fetch from google using bzr from a svn repo like this 

bzr svn-import http://feedparser.googlecode.com/svn/ feedparser
cd feedparser
bzr branch trunk mybranch
cd mybranch
bzr checkout

now the repository svn repo ( http://feedparser.googlecode.com/svn/ ) has some new updates that i want to fetch but since I changed some files in my local repo ( i.e. the bzr repo on my local machine ) how can I fetch and merge the updates with my update using bzr without loosing the update and my changes?

CharlesB
  • 86,532
  • 28
  • 194
  • 218
jspeshu
  • 1,211
  • 3
  • 12
  • 20

3 Answers3

2

Use pull command:

cd trunk
bzr pull http://feedparser.googlecode.com/svn/

or even

cd trunk
bzr pull

The latter may not work first time, but will work next time you do pull after pull with explicit URL.

After pull finished you can simply merge the changes from trunk into mybranch:

cd ../mybranch
bzr merge ../trunk

Inspect changes after merge and commit the result.

bialix
  • 20,053
  • 8
  • 46
  • 63
0

Did you try bzr update it will merge back changes from the upstream repository.

ismail
  • 46,010
  • 9
  • 86
  • 95
0

You can do a svn-import again to the imported repository, it will fetch only the new revisions.

Federico
  • 748
  • 6
  • 9