W dniu 27 grudnia 2009 19:52 użytkownik Arcadie M. Cracan <acracan@...400...> napisał:
I started with a local branch of lp:inkscape and then merged locally my gsoc work, and then pushed it back. What I did today was:
- change some files
- bzr commit
- bzr merge
- bzr push
I think the order of the commands should have been:
- bzr merge
- bzr commit
- bzr push
That's right, the changes that a merge introduces are stored as local changes. They need to be committed before pushing. SVN also behaves that way.
I think the best way to work for people more comfortable with the earlier SVN way of doing things is to have a folder with a trunk checkout rather than a branch (e.g. all commits go directly to the remote repository), and only use it to merge work from your branches, apply patches and do quick fixes (like build fixes).
Anyways, it seems strange to me that the revision number has changed and that all those subsequent commits became subrevisions.
This post and its reply might explain what happened. https://lists.ubuntu.com/archives/bazaar/2007q3/031160.html
Regards, Krzysztof.