yade-dev team mailing list archive

[Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>]

In the same situation, I use :

bzr update
bzr commit

Any reason why you have to create a branch?

B.

On 11/01/11 19:42, Václav Šmilauer wrote:
> I am not bzr expert, but I am sure you are doing something wrong. Are
> you merging the right way? trunk to your local copy or vice versa? I
> would recommend that you use rebase instead of merging, that tries to
> make your changes originating from the current upstream version (see
> docs, I think it is a plugin called bzr-rebase or such). Cheers, v.
>> 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
>>>
>>
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help : https://help.launchpad.net/ListHelp
>


-- 
_______________
Bruno Chareyre
Associate Professor
ENSE³ - Grenoble INP
Lab. 3SR
BP 53 - 38041, Grenoble cedex 9 - France
Tél : +33 4 56 52 86 21
Fax : +33 4 76 82 70 43
________________