On 10-Mar-09, at 2:06 PM, Nick Guenther wrote: > So I tried `bzr merge` and it whomped the launchpad changelog at > https://code.launchpad.net/~mixxxdevelopers/mixxx/release-1.6.2, > again. The logs of the revisions that got merged are still visible at > the command line with `bzr log` but not on the web interface. > > It turns out bzr has a shortcut for keeping a centralized repo around, > as we're doing. You say: > $ bzr bind lp:~mixxxdevelopers/mixxx/release-1.6.2 > and then > $ bzr up > works which is just like svn up. If you work in this way then you have > to `bzr up` before you're allowed to commit (so `svn up && svn commit` > ~= `bzr up && bzr commit && bzr push`). What I'm wondering if maybe if > we commit this way that launchpad will keep our logs visible. > > I need someone else with an account to help me test this theory.
Just some background on this for the list - Nick and I were playing around with "bzr merge" vs. "bzr push", as ways of sending the changes you have in your local branch back to a hosted remote branch. In this case, the remote branch is our 1.6.2 release branch on Launchpad. The problem with using "merge" is that it merges the changes from the remote branch into your local branch, and then considers those two branches "merged". When you push, it's like you've joined the two branches again, which isn't really what we want to be doing. Consequently, the changelog entries in the remote branch for changes that were merged get removed and replaced with your merger commit message, which can be confusing. After discovering that, I started using "bzr pull" to pull remote changes (instead of "bzr merge"), and then after committing the pulled changes to my local branch, sending back my own changes using "bzr push". This was working fine until Nick had this problem today where Bzr said his branch diverged too far to "pull" changes from or something. (Nick, can you give us some more information about this or clarify the situation if I misinterpreted?) I don't understand the difference between doing this binding thing and "pushing" though... ??? Thanks, Albert ------------------------------------------------------------------------------ Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are powering Web 2.0 with engaging, cross-platform capabilities. Quickly and easily build your RIAs with Flex Builder, the Eclipse(TM)based development software that enables intelligent coding and step-through debugging. Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
