yade-dev team mailing list archive

[Anton Gladky <gladky.anton@xxxxxxxxx>]

Sergei, I would recommend you to use "bzr checkout", "bzr commit", or
"bzr commit --local" if you need delayed commit.

In this case all will be ok, hopefully.

Cheers,

Anton




2011/1/11 Václav Šmilauer <eu@xxxxxxxx>:
> 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
>