/srv/irclogs.ubuntu.com/2010/02/24/#bzr.txt

bob2as in branch a subtree of an existing branch?  you can try "split", but I don't think it's production-y yet00:00
mathrickokay, so the correct fix is to s/map.//00:05
* mathrick hugs bzr blame00:05
gregcoitbob2: the option is to copy the dir to another place and init is as a new bzr branch, right?00:07
bob2yeah, but that loses history00:08
bob2you could also branch the whole thing, delete everything else and then move the files in this one dir to the root00:08
gregcoitbob2: oh, that works too - thanks!00:08
mathrickis there some trick to get bzr blame to find where a particular line has disappeared?00:43
lifelessuse gannotate and click around versions00:46
lifelessis what most people seem to do00:46
mathrickaha00:51
mathrickhttp://bazaar.pastebin.com/GaJP7cRb00:55
mathrickany idea what's wrong?00:55
dOxxxyarr01:27
pooliemathrick: this looks like an already fixed bug, are you up to date?01:33
mathrickpoolie: 2.1.001:33
poolieand also in bzr-git?01:34
mathrickbzr git is r72101:36
pooliesorry01:37
pooliesuggest you file or look for a bzr-git bug then01:37
mathrickok01:37
keithywhen I do bzr cat <remote url> it changes my remote directory setting how do I stop it?01:47
lifelesswhat do you mean?01:48
keithyI think I misunderstood the error01:50
keithyI got a "permanently redirected" report01:51
keithy<< is tired01:51
keithybtw if you are interested in how I am using bzr for squeak/cuis http://smalltalkers.pbworks.com01:51
pooliethanks keithy02:07
pooliehow are things working out?02:08
keithyin what respect?02:08
pooliejust with bzr and lp02:08
keithyI am suffering form spiderman syndrome...."with great power comes great responsibility"02:08
keithyvery well indeed02:09
keithysome quibbles with the squeak licence02:09
keithyI dont think people in the OSI community realise how much trouble they caused02:10
pooliei heard about some of that02:11
keithyit has taken something like 10 years to relicence squeak, all because of two paragraphs in the licence that arent relevant any more02:11
keithyfor example02:11
keithythe licence says, you cant distribute apples fonts02:11
keithybut readers of the licence dont think to ask if there are any apple fonts in the product to distribute02:12
keithythe last remnant was removed 6 years ago02:12
keithyApart from that02:13
poolieright02:13
keithyIn a week or so02:13
pooliei see your point about the difficulty of updating things that predate OSI02:13
keithyexactly, it was very disingenious of them02:13
keithyespecially when squeak was a pioneer of OS for commercial purposes02:13
keithythe SqueakL was actually designed to enable reuse for commercial purposes02:14
bob2who is 'them'?02:14
keithyunlinke Gnu etc02:14
keithysqueak was developed by a team in the Apple Technology Group02:14
keithythis team was originally at Zero parc02:14
keithyxerox02:14
keithyparc02:14
poolieok02:15
keithyThe system was released by xerox to the public by publishing the full spec in a book, the famous blue book02:15
poolieso, i hope we work something out02:15
poolierebooting, biab02:15
pooliei know, i read it years ago02:15
poolieit's pretty cool that it's out there02:15
keithyits on the net now02:15
poolierebooting, biab02:16
pooliei'm thinking about just removing the attempted fix for bug 456077 from 2.0 because of the fallout it caused02:30
ubottuLaunchpad bug 456077 in bzr "MYSQL/BZR P3: bzr doesn't explain it's doing a slow cross-format fetch" [High,In progress] https://launchpad.net/bugs/45607702:30
poolielifeless: ping, teddybear wanted on this02:34
lifelesspoolie: voice?02:34
poolieirc will do02:35
pooliejust about whether to revert the cross-format fetch warning in 2.002:35
lifelesswhat was the fallout02:35
pooliewarnings during upgrade02:36
poolieand the message is not always very clear, eg bug 51315702:36
ubottuLaunchpad bug 513157 in bzr "warning about on-the-fly upgrades to "(remote)", and when upgrading" [Medium,Confirmed] https://launchpad.net/bugs/51315702:36
lifelessright02:36
lifelessuhm, I think the upgrade one is easy enough; squelch the warning before starting upgrade.02:36
lifelessthe clarity one, seems like polishon the format %s that spiv worked on in france02:37
lifelessso, I would attempt to finish it off rather than revert it, myself.02:37
pooliei guess the fallout is not so severe that it needs to be immediately pulled02:37
poolieyeah02:37
poolieok02:37
pooliethanks02:37
lifelesspoolie: no probs02:45
lifelesspoolie: are you doing  https://bugs.edge.launchpad.net/bzr/+bug/515356 too?03:13
ubottuLaunchpad bug 515356 in bzr "unnecessary message about conversion during upgrade" [Medium,Confirmed]03:13
poolieyes03:13
lifelesscool; was wondering as its not assigne03:13
pooliei'm not doing it right now03:15
pooliei'm going to fix the underlying fetch thing first03:15
poolieis bug 388269 a dupe of bug 435048?03:19
ubottuLaunchpad bug 388269 in bzr "getting a branch into an empty shared repository takes a long time to figure out revisions to send" [High,Triaged] https://launchpad.net/bugs/38826903:20
ubottuLaunchpad bug 435048 in bzr "many get_parent_map calls during walk to common revisions" [Medium,Confirmed] https://launchpad.net/bugs/43504803:20
lifelessI think so03:20
lifelessif not a dupe then remarkably similar03:20
parthmHello, based on the discussion on bug 503670 'bzr grep', I have created a bzr-grep plugin explained here https://bugs.launchpad.net/bzr/+bug/503670/comments/1104:40
ubottuLaunchpad bug 503670 in bzr "bzr grep should be builtin" [Medium,In progress]04:40
ubottuLaunchpad bug 503670 in bzr "bzr grep should be builtin" [Medium,In progress] https://launchpad.net/bugs/50367004:40
parthmI would appreciate any review comments this as I am still new to bzrlib API. Whats a good launchpad mechanism for this? Probably the comments can be left on the bug listing?04:41
parthmAnother question, I am planning to work on the test cases, any pointers would be much appreciated.04:42
poolieparthm: there wasn't a bzr-grep already?04:45
parthmI could find anything. I saw bzr-search and ~vila/bzr/grep which was unix only.04:45
poolieok04:46
poolieso i don't think there's any particular way to say please review this from scratch04:46
poolieother than making an empty trunk branch04:46
pooliethen proposing a merge of all your code into that04:46
pooliewhich would work ok04:46
parthmSounds ok. So for the purpose of review, I would just branch the trunk and put in the grep folder so the comments can be tracked.04:47
parthmWhat would be a good way to create tests? Basically, I need to create a working tree, add files and file content. then run "bzr grep" on it pattern matching on output.04:49
Kilroo...I think I just figured out a set of process I can use to let my team treat our non-versioned ftp servers at work as if they are under version control with all the people who use raw ftp as a sort of "ghost committer."04:53
KilrooI'm not sure though. Gotta think about that. It may require either more steps to follow when committing, or finding somewhere I can put a bzr smart server and getting rather creative with hooks.04:55
=== mordred_ is now known as mtaylor
GaryvdMHi vila05:59
pooliehi GaryvdM, vila06:02
=== mordred_ is now known as mtaylor
GaryvdMHi poolie06:03
wgrantWhere is the bzr documentation?06:08
wgrantThe "Get Help" link on the website doesn't seem to lead there.06:08
GaryvdMhttp://doc.bazaar.canonical.com/en/06:09
wgrantThanks. How does a normal user get there?06:09
pooliewhich website?06:09
wgranthttp://bazaar.canonical.com/06:09
bob2"Documentation" link at the top left06:10
bob2or at the bottom06:10
wgrantAh, so to get help I don't actually use the "Get Help" link.06:10
poolieeasily fixed06:10
bob2if you say so06:10
pooliewith sudo_sarcasm06:11
pooliewgrant: howzat06:13
wgrantpoolie: Looks good. Thanks!06:16
* wgrant wonders if 90000 users is really a stat that wants to be widely advertised.06:20
GaryvdMwgrant: a often quoted figger for world wide developers is 9 mil. Based on that, bazaar is used by 1%06:39
GaryvdMHmm, dose not sound to good.06:39
poolieit's very hard to estimate usage of open source06:39
wgrantSo it's probably a bad idea to try.06:40
poolieis that on our homepage now, or elsewhere?06:44
GaryvdMvila: I wanted to talk to you about releasing bzr-gtk. I pop back later.06:44
wgrantpoolie: It's on the homepage.06:46
wgrantOtherwise the website is pretty nice now.06:47
wgrantParticularly with the compelling linked logos at the bottom.06:47
pooliethanks06:48
pooliewgrant: how about the project count06:49
poolieand the link to the popcon page?06:49
wgrantPopcon needs to die, not be linked to from anywhere :/06:49
poolie    Bazaar is used by thousands of people around the world on both open06:50
poolie    and closed projects, including<br/>06:50
wgrant+106:50
pooliegary?06:50
pooliemaybe s/thousands of//06:50
wgrantI considered that. It's hard to say.06:50
poolie    Bazaar is used by thousands of projects, both open and closed,06:51
poolie    including<br/>06:51
wgrantThat works.06:51
wgrantAnd is far more likely to be accurate.06:51
wgrantAnd cannot easily be interpreted as being a very low number.06:52
pooliek06:54
pooliecron will update it in a bit06:54
wgrantThanks.06:54
poolienot at all, thanks for the review06:54
vilahi all07:01
wgrantpoolie: Oh, I see that the number wasn't actually pulled out of nowhere.07:18
wgrantpoolie: But popcon is completely the wrong order of magnitude to use.07:19
pooliecause it undercounts?07:19
wgrantBzrPopularity oddly states the numbers as facts.07:19
wgrantpoolie: It's not enabled by default, and the option is well hidden.07:19
wgrantI don't know anybody who has it on.07:19
pooliewell, it's a fact (i presume) that's what it reports07:19
poolieright07:19
poolieme :)07:19
pooliebut feel free to update the wiki page07:19
wgrantAh, it is a wiki page. I see.07:20
wgrantSee, the most popular popcon package has only 1.4 million installations. We have quite a few more users than that.07:21
pooliesure, you're quite right07:22
etenilHi all11:28
etenilI made the mistake to branch manually (copy-paste of directory). And I have commited some changes in both branches now. How can I make the branch aware that it diverged from the trunk?11:30
bob2copying branches is fine11:31
etenilyeah, but merging them will be a problem11:31
bob2why?11:31
bob2bzr merge /the/other/one11:31
etenilwell, they don't know where they diverged no?11:31
bob2sure they do11:31
etenilah11:31
etenildoes bzr compare the history or something?11:32
bob2yes11:32
eteniloh I see11:32
bob2branch doesn't do anything inherently magic11:32
etenilthere was no need to worry then11:32
bob2you can use 'cp -a' if you prefer11:32
etenilok11:32
etenilI was afraid to have done something dumb :)11:32
etenilthank you for your help bob211:32
bob2well, back them both up first if you're worried :)11:32
etenilok11:33
etenilthanks a lot11:33
bialixjaьЖ рш13:37
bialixjam: hi13:38
bialixjam: about next windows installer: please use qbzr 0.18.1 for it, not 0.18.213:38
jambialix: why is that?14:11
jamah, found your email14:14
jambug #52448314:14
ubottuLaunchpad bug 524483 in qbzr "qrevert: Select all checked even if there is some files unchecked" [High,Fix released] https://launchpad.net/bugs/52448314:14
bialixофьЖ https://bugs.launchpad.net/bugs/52693315:01
ubottuLaunchpad bug 526933 in qbzr "qadd inadvertantly adds all my ignored files " [Critical,Confirmed]15:01
bialixjam: https://bugs.launchpad.net/bugs/52693315:01
bialixsorry15:01
=== gnomefreak76 is now known as gnomefreak
=== salgado is now known as salgado-lunch
aquariusyo, bzr people. Imagine, hypothetically, that I'd got a branch merged into the trunk of my project and everyone hated me for it, so I now want to submit a new branch which removes the changes that the previous one made. What's the easiest way to create this new branch?16:12
aquariusdo I just branch trunk, do bzr diff -r -5..-6 > patchfile (or whatever revision my branch landed in), then patch -p0 < patchfile and bzr commit?16:13
aquariusthat seems a bit long-winded16:13
james_waquarius: branch trunk16:14
james_wbzr merge -r -6..-5 .16:14
james_wbzr commit16:15
james_wbzr push lp:...16:15
aquariushaha! you can merge from yourself?16:15
james_wpropose merge16:15
aquariussmart. I didn't know you could do that :)16:15
james_wyep16:15
aquariusI knew you'd know a better way than making a patch file. Cheers, pal :P16:15
james_wand doing the revision range backwards applies the reverse diff16:15
IslandUsurperwait. -5..-6 *is* the backwards diff16:21
james_waquarius: err yeah, what IslandUsurper said :-)16:23
aquariusjames_w, I knew what you meant. negative numbers. It's the opposite of the opposite of what you think :)16:23
aquariusvds, ^ :-)16:23
vdsaquarius: yup16:23
CaMasonhow can I show which files were edited at a specific revision16:38
PengCaMason: bzr st -c 12316:39
PengCaMason: Probably16:39
rubbsCaMason: try bzr annotate filename16:40
rubbser...16:40
rubbsyeah I miss understood your question16:40
rubbspeng's answer might be better.16:40
PengMy answer is the best! :D Probably.16:40
rubbsheh16:40
CaMasonthx :)16:42
=== IslandUsurper is now known as IslandUsurperAFK
=== radoe_ is now known as radoe
stefanlsdHi, is it possible to remove a tag?17:46
stefanlsdoh ok. tag --delete works. i was using -d and it wasnt17:47
=== _TiN_ is now known as TiN
mathrickstefanlsd: -d means --directory18:12
=== IslandUsurperAFK is now known as IslandUsurper
bialixchannel trolls? really>19:27
* bialix summons garyvdm19:27
PengEh? Trolls? Where?19:28
bialixbanner said: [freenode-info] channel trolls and no channel staff around to help?19:29
bialixonly channel staff has weapon?19:30
bialixevening Peng, btw19:30
PengHi. :)19:31
bialixanybody seen new Joel Spolsky's project? http://hginit.com/index.html   Looks like very nice tutorial19:37
PengHehe, "Mercurial tutorial" rhymes.19:38
bialixI wonder why people started bashing svn19:41
PengBecause it's terrible, like Boxbot.19:42
fullermdIt's ugly, and its mother dresses it funny.19:43
bialixPeng, Boxbot is http://gunnerkrigg.wikia.com/wiki/Boxbot ?19:47
Pengbialix: Yes.19:47
bialixnobody likes boxbot19:47
bialixbut Martin Fowler does rate svn highly19:48
bialixand he don't like a Feature Branches19:48
bialixis not it's funny?19:48
gregcoiti'd like to make a co a branch from launchpad, then branch that co, make changes to the new branch, and push the changes to a new branch on launchpad (without effecting the original branch on launchpad).  Is that sane/o-able?19:50
gregcoiter, do-able19:50
bialixgregcoit: almost19:51
gregcoitwell, almost if close.  :)  what am I missing?19:52
fullermdSure, though within the confines of that the co isn't doing anything.19:52
bialixgregcoit: it's a bit hard to read your slang19:54
gregcoitbialix: yeah, i'm new to bzr terminology19:54
bialixgregcoit: you can omit the step of co19:55
gregcoitbialix: what I'm trying to do is take a part of a branch and make it into a new branch with history preserved while keeping the original branch unaffected19:55
bialixco wo nt he lp yo19:55
gregcoitkk - I can see that19:56
fullermdHey!  No Swahili in #bzr!19:56
bialixI hear you the white master19:57
fullermdWhen you run 'branch', you're creating a new independent branch.  Things done to it don't affect the original, unless you do things like 'push' that are designed to doing things inter-branch.19:57
bialixgregcoit: to extract part of the tree and preserve history.. it's not very easy19:57
gregcoitbialix: well, copy might be a betterterm than extract - I don't want to affect the orginal branch contents19:58
bialixevery branch is separate copy19:59
gregcoitbialix: ahh, ok, perfect20:00
gregcoitbialix: thanks for talking me through this20:00
bialixmay I advice you to read tutorial?20:01
bialixI'm not really sure I understand your intent20:01
gregcoitnot a bad idea....20:06
=== gregcoit is now known as gregcoit_lunch
bialixhmmm, Kiln is really attempting to be launchpad competitor20:15
maxbExcept Launchpad doesn't even attempt to enter the "here it is, you can run it on your own server if you like" market21:13
=== salgado is now known as salgado-afk
lifelessmoin21:20
pooliehi jam?21:35
jammorning poolie21:35
pooliehow are things?21:35
jamgoing pretty well21:36
=== gregcoit_lunch is now known as gregcoit
=== jelmer__ is now known as jelmer
=== jelmer is now known as Guest75587
=== Guest75587 is now known as ctrlsoft
pooliehi all22:57
ctrlsoft'morning poolie23:04
spivMorning.23:10
lifelessvila: ping23:15
pooliehi ctrlsoft23:23
ctrlsoftpoolie: fwiw I managed to get colocated branches in a git repo partially working, I can now list and access them using the patch I proposed to bzr.dev and an additional small change to bzr.dev23:28
RAOFctrlsoft: YOU ARE MY HERO23:29
ctrlsoftRAOF: :-) Please note the "in a git repo", this doesn't work in a native Bazaar branch yet and it's still a prototype at this point.23:30
RAOFThe *only* reason I want colocated branches is so that I can switch to bzr as my full-time git client.23:31
RAOFWhich means being able to pull & push non-master branches.23:31
* RAOF imagines a world where reading “git help add” doesn't happen quite so often23:31
pooliethat's great23:41
lifelessjelmer: nice23:44
lifelessPeng: was Peng taken on twitteR?23:45
RickCogleyhi - I'm a newbie at version control and at bazaar, and have bzr set up from the latest package on an os x server. Can I ask: when I set up a central repository, what are people doing? Setting up a single repository (e.g. organization name "acme") and putting projects under that, or, are people setting up multiple repositories... ?23:47
lifelessRickCogley: repositories are just for storage optimisation: when making a new branch in a repository from another branch in the same repository no data needs to be copied around23:48
lifelessRickCogley: this has several implications: many repositories are the norm - every user usually has a repository on their machine23:48
lifelesssecondly, you don't need to worry about them until you are up and running, they are an optional facility.23:48
lifelesslastly, whether you make one for all your projects, or one per project, is totally up to you.23:49
maxbAlthough for performance and disk-space reasons they rapidly become less optional if your project is large23:49
RickCogleyThanks lifeless and maxb. We are thinking we'd like to have a single central repository so that we can back it up, but I can see that perhaps if you were doing dev for clients, you might want multiple ones to make sure things are kept separate.23:50
lifelessmaxb: yes, but that users having to get it 'right' at the start leads to analysis paralysis23:50
RickCogleylifeless, ok, so it's kind of "ready, fire, aim" ?23:51
lifelessRickCogley: the use or not of repositories won't affect backups (except for the size of data: as a new user that is unlikely to worry you for a while)23:51
lifelessRickCogley: yup. My advice: *completely ignore* repositories for at least a week23:51
lifelessget used to branching, pushing, pulling, merging23:51
maxbI'd agree with that for a user. I think a server admin setting up a central server might want to have a think about them up front23:52
lifelessmaxb: ONLY if the admin is already fluent with bzr.23:52
mathrick<RAOF> The *only* reason I want colocated branches is so that I can switch to bzr as my full-time git client. <-- oooooh23:52
lifelessmaxb: otherwise they don't have the context to make the right decisions.23:52
RickCogleyI guess the idea is to just get used to it and you can merge things into a repository later... ?23:53
lifelessmaxb: and as repositories are just storage optimisation, its easy to add them in later, or remove them.23:53
mathrickand yes, git help whatever takes up way too big a chunk of my time spent interacting with git23:53
RickCogleylifeless, ok, I see.23:53
lifelessRickCogley: 'repository' is just a database. If you don't make one, bzr makes one when you run any of 'init' 'branch' 'checkout' 'push'23:54
lifelessRickCogley: let bzr do that while you learn the user facing concepts and concerns.23:54
lifelessRickCogley: /none/ of the every day bzr commands manipulate repositories. They all work with 'branches' and 'trees'.23:54
RickCogleylifeless, so in other words, you make a branch anyway when you check it out of a repository (not yet sure how to do that but...) and then the commands just work on your local copy. ?23:56
lifelessyou can't check out of a repository; its just a database23:56
lifelessyou check out of a branch23:56
lifelessdelete the work repository from your vocab; its not needed.23:56
lifelesss/work/word/23:56
bialixmathrick: but do you will miss index?23:56
mathricknot at all23:56
mathrickindex just gets in my way23:57
mathrickI use git when I have to, not by choice23:57
RAOFbialix: For me, the index is an incovenient version of “bzr shelve”23:57
bialixit seems there are 2 kinds of people: who loves index and who's not23:57
RickCogley*check out of a branch* *check out of a branch* *check out of a branch* :-)23:57
lifelessRickCogley: yup :)23:57
bialixRAOF: is not it's reverse thing?23:57
RAOFbialix: Which is one of the reasons it's inconvenient :).  Mostly I want to commit my changes.23:58
RAOFThat's the default case.23:58
mathrickbialix: index is used so rarely it doesn't make sense to make it the central element of everything23:58
bialixok ok23:58
RAOFIf I want to take some of my changes out, I'll *explicitly* do so, using a (more powerful) explicit command.23:58
bialixjust too many people around me buzzing how's cool index23:59
mathrickactually I use the interactive plugin to do most of my change management23:59
mathrickso I just go bzr ci and pick logical sets of changes until I have zero left23:59
lifelesspoolie: pig23:59
lifelesssorry!23:59
lifelesspoolie: ping23:59
RickCogleylifeless, may I ask: what is the strategy if you want to let visitors to a site download the latest version of a script, like a perl or shell script?23:59
bialixlifeless: !23:59

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!