Hey Jus, I think we can fix the situation by creating a new branch locally off and then pushing that to Launchpad.
I think you need to set up your SSH keys first before Launchpad will let you push to it though. To create an SSH key pair, go into a Terminal and run: ssh-keygen -t rsa Push enter when prompted to accept the default filename. Then look at your public SSH key by running: more ~/.ssh/id_rsa.pub and then copy and paste that into Launchpad here: https://launchpad.net/people/+me/+editsshkeys To push to your branch, you'd then do: cd [my_branch] bzr launchpad-login jus bzr push lp:~jus/mixxx/skins I pieced this stuff together from these pages: https://help.launchpad.net/Code/UploadingABranch https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair I saw you tried to do a merge via Launchpad - you don't need to worry about that yet. :) Thanks, and hope this helps, Albert On Sat, 2010-03-20 at 23:29 +0100, jus wrote: > Hello Albert, > i created a new branch but got "bzr push lp:~jus/mixxx/skins" as > command , no content. > > > I tried to merge the current trunk into the new "skins" branch and > then use this branch to create my local copy to work with. > > > Lauchpad gave me an error: > "Launchpad encountered an internal error during the following > operation: notifying people about the proposal to merge lp:mixxx into > lp:~jus/mixxx/skins. It was logged with id OOPS-1540MPCJ1. Sorry for > the inconvenience." > > > Can you give me a hint please.... > > > Thanks, > jus > > > > > On 20 Mar 2010, at 20:24, Albert Santoni wrote: > > > Hey Jus, > > > > You want a "Hosted" branch. Launchpad will create the branch on > > their > > servers and then give you a command to download that branch. Just to > > warn you, the command they give you will be something like: > > bzr branch lp:blahlblhablahlblah > > > > What that does is create a _local_ branch on your computer, which is > > branched from the hosted one on Launchpad. The workflow is a tiny > > bit > > more complicated than if you were to use bzr in "centralized" mode. > > I'd > > recommend using it in centralized mode just because it's easier. To > > do > > that, you'd use this command instead of the bzr branch one: > > > > bzr checkout lp:blahblahblah > > > > That would create some local folder that behaves just like CVS/SVN > > do, > > if you're familiar with those. The workflow is: > > > > 1) Make your changes (eg. add your skins to the res/skins/ > > directory) > > 2) "Add" the new files to the repository using "bzr add > > [new_folders]" > > 3) Commit your changes to the hosted repository by using "bzr ci". > > 4) If someone else commits to the repository, you can update your > > local > > copy with those changes by running "bzr update". > > > > Let me know if you get stuck! > > > > Thanks, > > Albert > > > > > > > > > ------------------------------------------------------------------------------ > Download Intel® Parallel Studio Eval > Try the new software tools for yourself. Speed compiling, find bugs > proactively, and fine-tune applications for parallel performance. > See why Intel Parallel Studio got high marks during beta. > http://p.sf.net/sfu/intel-sw-dev > _______________________________________________ Mixxx-devel mailing list > Mixxx-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/mixxx-devel ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel
