Hi Daniel!
> Hello,
>
> I hope it's the good place for this question, I have a branch of your
> dvc in a dvc.dev, I make some changes in it and you integrate them in
> your branch.
>
> Now, what must I do, bzr merge or bzr pull ?
>
> I do the last one with my dvc.package-maint (a branch of my dvc.dev),
> now it have the same history than my dvc.dev, is it a mistake ?
I am also new to bzr. Perhaps the help text to bzr pull will help:
% bzr pull --help
usage: bzr pull [LOCATION]
Turn this branch into a mirror of another branch.
This command only works on branches that have not diverged. Branches are
considered diverged if the destination branch's most recent commit is one
that has not been merged (directly or indirectly) into the parent.
If branches have diverged, you can use 'bzr merge' to integrate the changes
from one into the other. Once one branch has merged, the other should
be able to pull it again.
If branches have diverged, you can use 'bzr merge' to pull the text changes
from one into the other. Once one branch has merged, the other should
be able to pull it again.
If you want to forget your local changes and just update your branch to
match the remote one, use pull --overwrite.
If there is no default location set, the first pull will set it. After
that, you can omit the location to use the default. To change the
default, use --remember. The value will only be saved if the remote
location can be accessed.
options:
--help, -h show help message
--overwrite Ignore differences between branches and
overwrite unconditionally
--remember Remember the specified location as a
default.
--revision ARG, -r
--verbose, -v display more information
So I would guess, you should use bzr pull
So please make a backup copy, try it and report your results.
Stefan.
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
