PS I have some question regarding merging in bzr. I've
banched from my launchpad branch on other machine and
pushed a few commits back to launchpad. After that, I've
made some commits on tree branched from launchpad earlier.
So, now I have diverged branches on launchpad and on my
machine. When I do 'bzr merge' && 'bzr commit' will it
preserve individual diverged commits and commit messages?
Yes, the history of the two branches will be preserved. The merge
operation will be seen as a new commit in the branch you are merging
into, possibly solving some conflicts.
However, the standard "bzr log" will only show the history of the branch
you are merging into, not the history of the merged branch. You'll need
a tool like "bzr explore" to visualize graphically the entire history.
The output will look approximately like this:
http://dev.mysql.com/common/images/articles/Bzr-intro-bzr-visualize.png
Work done this week:
* Launched MMU in kernel
* Added ASID support /w ASID FIFO (256 ASIDs supported)
* Created full exception table
* Created GRLIB interrupt controller driver (not committed yet)
* Plugged in UART kernel driver (not committed yet)
This sounds promising, Keep up the good work.
As a general info for the others, ESA SOCIS 2013 coding period has
finally started:
https://groups.google.com/forum/#!topic/esa-socis/fGP2UWotYpw
M.D.
_______________________________________________
HelenOS-devel mailing list
[email protected]
http://lists.modry.cz/listinfo/helenos-devel
