ubuntu-manual team mailing list archive

[Ryan Macnish <nisshh@xxxxxxxxxxx>]

Yea,

Id say that was the problem, what everyone really needs to do is to:

Do a bzr pull to get the latest commit.
Make your changes.
Do another bzr pull to make sure you are still on the latest revision.
Commit your changes.
Push them up to launchpad.

You really MUST do this or the branch will keep on breaking and that will slow us all down since someone then has to go and fix the branch.

Ryan Macnish

> Date: Wed, 10 Feb 2010 14:07:34 +0000
> From: kelvin@xxxxxxxx
> To: nisshh@xxxxxxxxxxx
> CC: ubuntu-manual@xxxxxxxxxxxxxxxxxxx
> Subject: Re: [Ubuntu-manual] PLEASE READ THIS NOTICE!
> 
> I think this happened at 210. My local branch is 210 which I pushed to 
> LP, put the LP 210 is a different commit, my last commit is not logged 
> on LP.
> 
> I don't know what happened I pushed as normal. Anyway I've pull the 
> current branch with --overwrite and re-committed the changes.
> 
> Kelvin
> 
> Ryan Macnish wrote:
> > hey everyone,
> >
> > I encountered an error message today while trying to pull changes from 
> > launchpad for lp:ubuntu-manual, i nutted it out and thought id post 
> > the solution here just in case anyone else happens to get this too:
> >
> > If you get an error message about the branch being diverged on your 
> > local machine while running:
> >
> > bzr pull
> >
> > just run it with this flag to fix the problem:
> >
> > bzr pull --overwrite
> >
> > That flag will overwrite any local changes you have made to the your 
> > local copy so be careful when you use it. After you have pulled the 
> > changes with that command once you can go back to just using:
> >
> > bzr pull
> >
> > This seems to have happened between r210 and r213.
> >
> > Please email me if you are still having issues.
> >
> > Ryan Macnish
> >
> > ------------------------------------------------------------------------
> > Get straight to the Point Find a great deal on your next car. 
> > <http://clk.atdmt.com/NMN/go/157637060/direct/01/>
> > ------------------------------------------------------------------------
> >
> > _______________________________________________
> > Mailing list: https://launchpad.net/~ubuntu-manual
> > Post to     : ubuntu-manual@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~ubuntu-manual
> > More help   : https://help.launchpad.net/ListHelp
> >   
> 
 		 	   		  
_________________________________________________________________
If it exists, you'll find it on SEEK. Australia's #1 job site
http://clk.atdmt.com/NMN/go/157639755/direct/01/