"Daniel 'NebuchadnezzaR' Dehennin" <[EMAIL PROTECTED]> writes:
> Hello, > > I hope it's the good place for this question, This is more a bzr question, but we have an established tradition of asking and answering questions about our back-ends here too, and to redirect the discussion to the appropriate ML if it gets too technical or if it can bring some ideas to the developers. > 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 ? Normally, "pull" will tell you to do a merge ;-). pull can be used either when one branch is a subset of the other (identical branches except for some missing patches on your side), or when the branches have converged (i.e. you did a merge, which didn't modify your working tree. This happens when the two parties merge from each other). pull will just take the new revisions from the other branch and put them into yours, merge will create a new revision in your branch, that you'll have to commit. > 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 ? You just had convergence, and bzr noticed it. There were several ways in your ancestry graph to the head revision, and bzr has applied the upstream one in your branch (the other revisions are still in your repository). Indeed, I don't like the fact that bzr changes the history of my branch on a pull, it wasn't the case previously, but I think there are some good reasons for that. Continue the discussion on bazaar-ng if you want to know more. -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
