| hstuart | hey - been looking through the docs for a while without much luck... is there a way to alias urlspecs so if I collaborate with, say, 2 other people I can go: bzr merge user1 or bzr merge user1 instead of bzr merge reallylongurl or bzr merge somethingelseIllfroget ? :) | 00:27 |
|---|---|---|
| bob2 | bzr-bookmarks plugin | 00:27 |
| bob2 | aiui | 00:27 |
| hstuart | gracias | 00:28 |
| epsy | oh, and for the tag thingy: tag=$(bzr tags | grep -P "^(.*?) +${rev}$" | awk '{ print $1 }') | 00:29 |
| rocky | hrm ... i've been using a bzr repo and the other day i accidentally did a "bzr init" in that repo dir which turned it into a branch as well, any way to un-branch it? :) | 01:00 |
| gotgenes | rocky: rm .bzr? | 01:00 |
| gotgenes | er, rm -rf | 01:01 |
| gotgenes | but be careful | 01:01 |
| gotgenes | make sure you're in the right spot | 01:01 |
| rocky | um, but isn't the repo stuff stored in .bzr ? | 01:01 |
| gotgenes | it is | 01:02 |
| gotgenes | did you cd into your .bzr repo | 01:02 |
| gotgenes | and then issue "bzr init"? | 01:02 |
| rocky | yes | 01:02 |
| rocky | (some time later on) | 01:02 |
| gotgenes | rocky: okay. then cd into your repo's .bzr repo | 01:03 |
| rocky | but i've never committed anything to that repo/branch | 01:03 |
| gotgenes | do an ls -a | 01:03 |
| gotgenes | you should see another .bzr inside it | 01:03 |
| gotgenes | rm -rf that one | 01:03 |
| rocky | no wait, i think i'm confused... | 01:03 |
| rocky | this is what i did... | 01:03 |
| gotgenes | Actually, just to be certain, do this | 01:03 |
| rocky | bzr init-repo sandbox | 01:03 |
| rocky | cd sandbox | 01:03 |
| rocky | bzr init | 01:03 |
| gotgenes | ah | 01:04 |
| rocky | that last "bzr init" was the culprit | 01:04 |
| gotgenes | rocky: http://paste.lisp.org/display/72693 Looks like you can just remove the branch and checkout directories | 01:09 |
| rocky | ah cool | 01:10 |
| rocky | another question ... if i have 2 branches which are actually near identical but have no common ancestry, how do i merge revisions 2 and 3 from branch X into branch Y ? | 01:11 |
| gotgenes | Ah, dinnertime. ArrivederLa! | 01:12 |
| jelmer | rocky: that's pretty tricky at the moment I think | 01:15 |
| jelmer | it has come up a couple of times in the past | 01:15 |
| jelmer | you mayt want to ask about it on the mailing list | 01:15 |
| === fta_ is now known as fta | ||
| rocky | jelmer: well, i've tried simply doing "bzr merge -r 2..3 ../source-branch" to get just the revisions i want, it removes a source dir in the target branch for some odd reason (and my 2..3 range does not include removing a dir) | 01:17 |
| rocky | i'm getting tempted to simply do "bzr diff -r2..3 ../source-branch > patch.txt; patch -p0 < patch.txt" | 01:18 |
| rocky | which works just fine | 01:18 |
| jelmer | rocky: that is probably the easiest thing to do at the moment I think | 01:19 |
| jelmer | there aren't many tools for bzr that handle parallel imports at the moment | 01:19 |
| === Hydrogen_ is now known as Hydrogen | ||
| rocky | that's ugly =P | 01:19 |
| Hydrogen | well | 01:20 |
| Hydrogen | you could use std{in|out} | 01:20 |
| Hydrogen | instead of the file | 01:20 |
| rocky | the base of what i'm trying to do actually is i have a trunk branch from an hg repo and i've added it to my own bzr repo and i've then made small modifcations to add the functionality i want ... | 01:20 |
| * jelmer mutters something about revision id aliases | 01:20 | |
| Hydrogen | and then write yourself a bash alias | 01:20 |
| rocky | then i hg cloned another tag of the hg branch and wanted to apply the same changes there | 01:20 |
| Hydrogen | and do bzr-coolname revision1 revision2 source-branch | 01:21 |
| === RAOF_ is now known as RAOF__ | ||
| === RAOF__ is now known as RAOF | ||
| === cafuego is now known as iExpense | ||
| === iExpense is now known as cafuego | ||
| === Quadduc1 is now known as Quadduc | ||
| === asac_ is now known as asac | ||
| rindolf | Hi all! I'm unable to build the RPM of bzr-svn : https://bugs.launchpad.net/bzr-svn/+bug/311712 - a similar problem happens with bzr-svn-0.4.16 | 11:10 |
| ubottu | Ubuntu bug 311712 in bzr-svn "bzr-svn-0.5.0~rc1 - python setup.py bdist_rpm fails" [Undecided,New] | 11:10 |
| === asac_ is now known as asac | ||
| jelmer | rindolf, still there? | 12:43 |
| rindolf | jelmer: yes. | 12:43 |
| jelmer | rindolf, I think the fact that bzr-svn includes subvertpy is what is causing the problems here | 12:47 |
| rindolf | jelmer: ah. | 12:47 |
| jelmer | rindolf, If you build them separately and perhaps strip subvertpy out of bzr-svn, it may work better | 12:47 |
| rindolf | jelmer: :S | 12:48 |
| rindolf | jelmer: from where can I download subvertpy? | 12:53 |
| jelmer | rindolf, launchpad.net/subvertpy | 12:53 |
| rindolf | jelmer: I don't see a download link. | 12:54 |
| rindolf | https://launchpad.net/subvertpy/+download | 12:54 |
| jelmer | rindolf, There's no packaged release, you would need to fetch the bzr branch | 12:54 |
| rindolf | jelmer: OK. | 12:55 |
| rindolf | jelmer: how? | 12:56 |
| jelmer | rindolf: e.g. "bzr branch lp:subvertpy subvertpy" | 12:56 |
| rindolf | subvertpy/client.c:26:18: error: util.h: No such file or directory | 13:00 |
| rindolf | subvertpy/client.c:27:16: error: ra.h: No such file or directory | 13:00 |
| rindolf | subvertpy/client.c:28:16: error: wc.h: No such file or directory | 13:00 |
| rindolf | That's what I get when I try to bdist_rpm subvertpy | 13:00 |
| rindolf | jelmer: ping. | 13:03 |
| jelmer | rindolf: you need to install the subversion development libraries | 13:10 |
| rindolf | jelmer: I installed them. | 13:50 |
| jelmer | rindolf, what location are they in? | 13:50 |
| rindolf | jelmer: /usr/include/subversion-1/ | 13:51 |
| jelmer | rindolf, it looks like the RPM stuff doesn't work here either | 13:56 |
| jelmer | It wasn't ever tested, it's just there by default in distutils | 13:56 |
| rindolf | jelmer: OK. | 13:57 |
| === fta_ is now known as fta | ||
| === Mario__ is now known as pygi | ||
| rexbron | james_w, jelmer: I have submitted the merge request on launchpad, is there more I should do to get it looked at? | 17:43 |
| jelmer | rexbron, james_w is the bzr-builddeb maintainer :-) | 18:29 |
| abentley | lifeless: www.squid-cache.org is down. | 18:56 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!