=== yofel_ is now known as yofel | ||
KombuchaKip | I have a bundle file someone sent me of their changes to my branch. I'd like to apply their changes, but selectively. Is there a GUI manual merge technique? | 00:59 |
---|---|---|
luke-jr | I got disconnected during a long branch (from a remote branch); is there a way to use the already-downloaded data when I try again? | 01:56 |
jave | hello | 11:41 |
jelmer | hi | 11:41 |
jave | I'm playing with fastimport/export. For example, the emacs bzr repo. A conversion takes: Exported 121365 revisions in 1:36:59 | 11:42 |
jave | (I use a gitbzr script for convenience) | 11:42 |
jave | wheres the bottleneck? I dont think the server used is super slow at least | 11:43 |
rawr | profile it and find out. | 11:46 |
jelmer | jave: are you fastexporting directly from the server? | 11:48 |
jelmer | jave: that won't be very fast, it'll be trying to manually extract all full texts | 11:48 |
jave | jelmer: no theres a local bzr emacs checkout I convert from | 11:50 |
wgz | do you mean checkout? because that's just the tree state, you need the whole repository locally# | 11:51 |
jave | sorry im not too good with the bzr terminology. I meant an entire copy of the emacs repository. | 11:52 |
jave | can I, say, convert the repo disk format to something that is space-inefficient but fast? | 11:54 |
qaghan | Guys, I have a problem. I cannot push files onto Launchpad. I created an SSH key, copied and registered it on Launchpad, have the files in my /.ssh folder and the trunk of my project that I want to push | 14:34 |
qaghan | but I still keep getting the permission denied(publickey) error | 14:34 |
qaghan | I did do $ bzr launchpad-id thingie also | 14:35 |
xuedi | hello there, this might be a stupid question, i installed bzr-gtk on debian ... Does someone know the name of the binary to start the gtk frontend? bzr-gtk does not exist | 17:02 |
kbulgrien | dpkg -L <package_name> | 19:30 |
kbulgrien | Why do people ask questions and leave only minutes later... | 19:30 |
=== yofel_ is now known as yofel | ||
SteveA | good evening! | 20:52 |
SteveA | I'm introducing bzr to a team that is using Eclipse on Ubuntu, and looking for a recommendation of whether to suggest QBrzEclipse or BzrEclipse. | 20:53 |
SteveA | hi beuno, BjornT, bob2, elmo, jamesh, james_w, herb, jelmer, kirkland, lamont, lifeless, mthaddon, mwhudson, Ng, spiv, verterok! Look me up if you're in London. | 20:58 |
SteveA | hi jam too | 20:59 |
lifeless | SteveA: hi :) | 21:04 |
lifeless | uhm | 21:04 |
lifeless | I think qbzreclipse has more cycles being put into it | 21:04 |
lifeless | bzreclipse is a little unmaintained at the moment I think, verterok is flat out with $otherstuff | 21:04 |
SteveA | thanks lifeless | 21:37 |
SteveA | any recommendations on what the best svn integration is right now? | 21:37 |
lifeless | bzr to svn, or eclipse to svn ? | 21:37 |
lifeless | bzr-svn if you mean the former. | 21:38 |
SteveA | svn to bzr and back, although for the back journey, we'll most likely produce hand-crafted patches and manually commit to svn | 21:38 |
SteveA | so, mainly taking an svn branch at a particular revision, and want to make a bzr branch of that | 21:38 |
SteveA | and be able to pull updates from that svn branch over time | 21:39 |
lifeless | bzr-svn | 21:39 |
SteveA | ta | 21:39 |
lifeless | 'bzr branch svn:///.... '.... wait, bzr pull at later date | 21:39 |
SteveA | nice! | 21:40 |
lifeless | it will do some fairly extensive number crunching if the repo is big, on first execution. | 21:41 |
lifeless | This maps out the whole history etc. It stores it in a db in ~/.bazaar/svn/ IIRC. So its fast on second and third etc | 21:41 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!