Thread: Right way to download/merge latest source
View Single Post
Old 05-06-2011, 02:10 PM   #7
chaley
Grand Sorcerer
chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.chaley ought to be getting tired of karma fortunes by now.
 
Posts: 12,476
Karma: 8025702
Join Date: Jan 2010
Location: Notts, England
Device: Kobo Libra 2
Quote:
Originally Posted by meme View Post
Maybe bzr merge isn't what I want. Is there a way to force pulling down the latest source and overwriting/adding/removing the necessary files to make sure I have the current source, without deleting/re-downloading?
If you are working with a copy of trunk (the latest source) and are *not* making changes in that source tree, then use bzr pull. You might need to use bzr pull --overwrite to force the branch to be in sync with what is on launchpad.

Do not use pull on a branch you are making changes in. There you must use merge. That is why I merge from my copy of trunk to my development tree/repo.
chaley is offline   Reply With Quote