Hey all, Sean pointed out that every time I push to the release branch, I seem to replace everyone's commits with a 'Merge' message from myself. If you click on my merge, then you can click on the branch I merged, and get to the original commits. They are all still there, it's just the way I'm using bzr is replacing the remote branch history with my local one when I push. The merge/commit/push workflow works fine by default on git, so I was just treating bzr like a git clone. It turns out bzr treats this slightly differently.
I went into #bzr to figure out what I was doing wrong. It turns out that I need to have two branches -- one solely for pulling/pushing, and a feature branch. You do all your work in the feature branch, then go into your upstream branch, first pull from upstream, then merge from your feature branch, then push upstream. This will eliminate the problem of the history being obscured in the Launchpad branch view page. Sorry to all whose commits I hid! I mentioned in #bzr that I was working on Mixxx, and someone PM'd me with this article: http://www.maximumpc.com/article/features/the_ultimate_audio_apps_aspiring_dj_180 It was just published today. Funny coincidence :) Cheers, RJ ------------------------------------------------------------------------------ _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
