yade-dev team mailing list archive

["Sergei D." <sj2001@xxxxxxxxx>]

I use "bzr branch"  to create a branch
then, "bzr ci" to commit to the branch (i.e. a local commit)
then, "bzr pull" to get revisions from the trunk
and "bzr push" to put my revisions to the trunk.

If I have some local commits and the trunk have some commits after my 
last "bzr pull",
my branch and the trunk is diverge. So, I need "bzr merge" to merge my 
branch and trunk, then "bzr ci" to local commit a merged sources and 
"bzr push" to put my revisions to the trunk.

> I see, do you use bzr checkout or bzr merge?
>
> Anton

--
Best regards,
Sergei D.