| Hobbsee | michelecs: yes, -U. | 00:43 |
|---|---|---|
| Hobbsee | well, that'll only add -1 (or whatever) | 00:43 |
| michelecs | Hobbsee: actually I tried, but what I got is a package named something-0.5ubuntu1ppa1ubuntu1 | 00:44 |
| Hobbsee | strange. | 00:47 |
| Hobbsee | damn. builldd.py appears to be broken again. | 00:56 |
| michelecs | Hobbsee: do you mean build.py has a role in my problem? | 01:02 |
| Hobbsee | michelecs: no | 01:02 |
| michelecs | ah, ok | 01:02 |
| * Hobbsee just tried to rescore builds, and noticed that it doesn't work. | 01:02 | |
| cjwatson | michelecs: certainly with current devscripts, 'dch -iU' won't ever append ubuntu1 to the end | 01:29 |
| michelecs | cjwatson: mmm .... never tried the U option... it's not on the man page | 01:31 |
| cjwatson | michelecs: but, if dch gets it wrong, just edit debian/changelog by hand (and rename the directory if necessary) | 01:31 |
| cjwatson | man page> bug 179969 | 01:31 |
| michelecs | cjwatson: I'm already editing by hand, but you know, using just script would be much cooler | 01:31 |
| cjwatson | sure | 01:31 |
| cjwatson | use -U | 01:31 |
| michelecs | Yes! It works! Thanks cjwatson... Why this option is not on the debchange man page? | 01:33 |
| cjwatson | it's a bug, see above | 01:36 |
| cjwatson | it's mentioned in dch --help at least | 01:36 |
| michelecs | Thanks cjwatson, this will really help me to sleep better | 01:37 |
| ajmorris | hello, i was just wondering about the status of launchpad mailing lists, for ubuntu related teams. Originally i got denied for my request of an ubuntu related team, however, i have heard that ubuntu related teams can now get launchpad mailing lists? | 02:00 |
| === fta_ is now known as fta | ||
| RAOF | Why do people trawl launchpad sticking random tags on bugs? Grr. | 06:18 |
| RAOF | This random gripe brought to you by gnome-do bugs we know how to fix, and don't need "cpu" and "memory" tags attached to. | 06:20 |
| Hobbsee | RAOF: they want karma. | 06:21 |
| wgrant | Stupid power companies. | 06:21 |
| RAOF | Does it nourish them, as the blood of innocents? | 06:21 |
| wgrant | They tell us they're going to turn off the power, but don't. | 06:21 |
| RAOF | And then turn it off at an inopportune time? | 06:23 |
| wgrant | Probably. | 06:23 |
| wgrant | But we had to have devices switched off just in case. | 06:23 |
| === sabdf1 is now known as sabdfl | ||
| highvoltage | hey launchpadders | 10:24 |
| * wgrant is shocked. | 10:25 | |
| highvoltage | heh :) | 10:25 |
| highvoltage | have you ever considered developing launchpad widgets that can be used in other websites and content management systems? | 10:26 |
| highvoltage | I've created a brainstorm idea for it, so if you have any reasons for/or against it, please comment and vote. | 10:27 |
| intellectronica | highvoltage: you can develop such widgets using the API | 10:27 |
| * wgrant wouldn't really want to have $FOREIGN_WEBAPP to have a Launchpad cookie for him. | 10:28 | |
| intellectronica | highvoltage: also, if you want to make suggestions for LP development, the best thing to do is register a spec or file a bug on launchpad itself | 10:28 |
| wgrant | It'll be particularly nasty when we can modify primary archives through the web UI. | 10:28 |
| mwhudson | wgrant: i wouldn't grant "allow modification of all data" to a random website, to be sure :) | 10:29 |
| highvoltage | intellectronica: ok | 10:29 |
| highvoltage | wel, it would be nice for a few things, I think | 10:29 |
| highvoltage | like, you could perhaps have a widget that lists the last bugs you worked on on your blog | 10:29 |
| intellectronica | highvoltage: you already have feeds which you can try and use for doing something like that | 10:30 |
| highvoltage | or show some alerts of things that someone might want to be aware of. so the widgets would be more informational than functional | 10:30 |
| intellectronica | i think some users already do | 10:30 |
| highvoltage | intellectronica: those use RSS atm though? or are there widget-kind like things that can be used? | 10:31 |
| intellectronica | highvoltage: atom, no widgets | 10:31 |
| highvoltage | ah | 10:31 |
| Sp4rKy | hi | 11:11 |
| Sp4rKy | https://launchpad.net/~harshitagrawalpress <=== this guy uses lp for spam purpose (https://bugs.launchpad.net/elbuntu/+bug/273067) | 11:11 |
| ubottu | Ubuntu bug 273067 in elbuntu "How to find a legal online movies site" [Undecided,New] | 11:11 |
| wgrant | Sp4rKy: You could ask a question at https://answers.launchpad.net/launchpad | 11:14 |
| Sp4rKy | wgrant: yep, i just see that and did it | 11:15 |
| === thekorn_ is now known as thekorn | ||
| === nebi is now known as nebi|away | ||
| === nebi|away is now known as nebi | ||
| MagicFab | Hi there | 13:18 |
| MagicFab | how can I become an " Answers" contact for a given team/project ? | 13:19 |
| wgrant | MagicFab: https://answers.launchpad.net/someproject/+answer-contact | 13:20 |
| MagicFab | wgrant, tx - wasn' t finding any direct links, I guees it' s not enable for this particular project (ubuntu-hp) | 13:22 |
| wgrant | MagicFab: Not on http://answers.launchpad.net/ubuntu-hp? | 13:23 |
| wgrant | Apart from that project not existing... | 13:23 |
| MagicFab | Actually it' s https://answers.edge.launchpad.net/~ubuntu-hp | 13:24 |
| wgrant | That's a person/team, not a project. | 13:24 |
| wgrant | Persons don't have questions asked against them. | 13:24 |
| MagicFab | correct, I though answers was available to both | 13:24 |
| wgrant | I don't think that makes sense. | 13:24 |
| MagicFab | wgrant, oh I think it does :) | 13:25 |
| wgrant | MagicFab: What is your use case? | 13:25 |
| MagicFab | "how do I XXX with YYY model of HP ?" | 13:26 |
| MagicFab | (as a team) | 13:26 |
| wgrant | Hmmmmmm. | 13:26 |
| MagicFab | Or maybe it' s the team that should be answer contact for an HP project | 13:27 |
| wgrant | I think that would make sense. | 13:27 |
| MagicFab | It' weird cause I can be an answer contact for other teams AND projects, just not this one. | 13:33 |
| === bac_afk is now known as bac | ||
| wgrant | MagicFab: Teams don't have answer contacts. | 13:36 |
| rsc- | is there a way for me to automatically make build packages from the latest revision of my project's trunk? | 14:01 |
| === cody-somerville_ is now known as cody-somerville | ||
| === cody-somerville is now known as cody-somerville_ | ||
| === cody-somerville_ is now known as cody-somerville | ||
| rsc- | is there a way for me to automatically make build packages from the latest revision of my project's trunk? | 15:36 |
| === _neversfelde is now known as neversfelde | ||
| glade88 | barry: ping | 15:54 |
| rockstar | rsc-, Do you keep the debian/ folder in your project's trunk? | 15:55 |
| rockstar | rsc-, there is a bzr plugin for building packages called bzr-builddeb (https://edge.launchpad.net/bzr-builddeb) | 15:59 |
| barry | glade88: otp. what's up? | 16:00 |
| glade88 | barry: I had a general question.. and since it was regarding launchpad, i'm telling you :) | 16:01 |
| glade88 | while adding branding images to a launcpad team, we need 3 images.. | 16:03 |
| glade88 | one 192x192, one 64x64 and one 14x14 | 16:03 |
| glade88 | whats the use of 64x64.. its showed up nowhere in the new launchpad.. (which used to come up in the older one beside the heading of the team page) | 16:03 |
| glade88 | sorry.. bad english :/ | 16:03 |
| rsc- | rockstar, what about being able to have the latest source package (from trunk) for download on my Launchpad project's homepage? | 16:07 |
| rockstar | rsc-, there are the PPAs. A few of my projects do something similar. | 16:07 |
| rsc- | :( sigh, okay. | 16:10 |
| jcastro | barry: ok, the only other group with a previously-declined list that I wanted to approve was ~64-bit | 16:13 |
| rsc- | how can i delete a release? | 16:15 |
| rsc- | i made a few typos on the version numbers. | 16:15 |
| rsc- | https://launchpad.net/dusttheme/trunk/0.1.20090922 | 16:15 |
| barry | glade88: that's a good question, i don't remember. i know it was used at one point though | 16:27 |
| barry | jcastro: i just purged the list for ~64-bit. they should be able to re-request it now | 16:28 |
| glade88 | right.. and it isnt used anymore since now there's this tab like thing at the top which has the 14x14 icon. so shouldn't the entry for the 64x64 icon be removed? | 16:28 |
| barry | jcastro: while i have you here have you looked at +mailinglists recently? i don't know what to do with those 5 lists | 16:28 |
| barry | glade88: seems reasonable to me. can you open a bug report on that? | 16:28 |
| glade88 | ya, sure | 16:29 |
| jcastro | barry: the ones that are sitting there are because I've sent them a mail asking for clarification and have not gotten a response yet. | 16:29 |
| jcastro | barry: usually I give it a bit, then I decline, then they send an angry mail, repeat. | 16:29 |
| barry | jcastro: sounds perfect :) | 16:30 |
| barry | glade88: thanks | 16:30 |
| glade88 | :) | 16:30 |
| barry | jcastro: i know yastwitt's been there for a long time. maybe we should decline it? | 16:30 |
| jcastro | yeah I got no response and have no clue what it is | 16:30 |
| barry | me neither. okay, i'm going to decline it | 16:31 |
| jcastro | delhi should have a lists.ubuntu.com list real soon now. | 16:31 |
| jcastro | tagalog is waiting for response, and that colombia one is new, so I will mail them | 16:31 |
| barry | jcastro: thanks | 16:34 |
| glade88 | barry: should I subscribe you to the bug? | 16:39 |
| barry | glade88: sure | 16:39 |
| glade88 | okay . thx | 16:40 |
| tgm4883_laptop | Is there some reason that project bugs won't expire, even though the project is setup to have them expire? | 16:41 |
| tgm4883_laptop | for instance, !bug 151612 | 16:42 |
| ubottu | Launchpad bug 151612 in mythbuntu "Remote not supported" [Wishlist,Incomplete] https://launchpad.net/bugs/151612 | 16:42 |
| LaserJock | Rinchen: ping? | 17:03 |
| Rinchen | LaserJock! | 17:04 |
| Rinchen | this must be the ping for the products | 17:04 |
| LaserJock | yep | 17:04 |
| LaserJock | Rinchen: so I just wanted to make sure we're all clear | 17:04 |
| Rinchen | ok, I have the question pulled up. Just need those urls inside the question | 17:05 |
| Rinchen | as long as the ownership items are ok, I can make the change | 17:05 |
| LaserJock | Rinchen: how does ownership get affected? | 17:05 |
| === salgado is now known as salgado-lunch | ||
| LaserJock | Rinchen: will be just blow away the existing matplotlib project? | 17:07 |
| Rinchen | LaserJock, I haven't looked at who the owner is today. If it's registry, for example, then I can make the changes | 17:08 |
| Rinchen | LaserJock, if it's not, I have to contact the owner for approval first | 17:08 |
| LaserJock | Rinchen: it's not registry | 17:08 |
| Rinchen | LaserJock, ok, thanks for the links. I now need to contact those two folks | 17:10 |
| glade88 | hello.. does an administrator of a team has lesser privileges than its owner? | 17:10 |
| LaserJock | Rinchen: alright, thanks for doing that. It should make future work by Ubuntu much better if we have the right project set up :-) | 17:11 |
| LaserJock | glade88: I believe so yes | 17:12 |
| LaserJock | glade88: an owner can change the owner of the team, for instance :-) | 17:12 |
| dsargeant | hello, can I request than an unused launchpad account that I assume was autocreated be deleted so that I can steal the user name (dsargeant)? I tried to contact the user via the given email, but it bounced. | 17:12 |
| glade88 | LaserJock: except for ownership change privileges, an admin can do everything the owner can? | 17:13 |
| glade88 | like setting up the launchpad mail list as the team's email address? | 17:13 |
| LaserJock | glade88: I think so yes | 17:15 |
| glade88 | oh.. so we have a bug heh :D | 17:15 |
| LaserJock | glade88: I just looked at a team I'm admin-but-not-owner of and it looks like I can set branding, email address, etc. | 17:15 |
| glade88 | i'll post the bug report.. please see if you can reproduce it | 17:16 |
| LaserJock | glade88: how do you mean? | 17:16 |
| LaserJock | I'd think it'd be a bug otherwise personally | 17:16 |
| glade88 | ya it will be.. | 17:17 |
| glade88 | LaserJock: if one is the admin but not owner of a team and he accesses https://edge.launchpad.net/~teamname/+mailinglist , he is not allowed in. But the owner is | 17:19 |
| LaserJock | glade88: that sort of make sense | 17:19 |
| glade88 | how come? | 17:19 |
| LaserJock | well, that's a rather major change | 17:20 |
| LaserJock | not one that gets easily reverted | 17:20 |
| glade88 | so thats the second thing an admin cannot do | 17:20 |
| glade88 | it does | 17:20 |
| glade88 | it can be reverted by an admin | 17:20 |
| glade88 | but set up by the owner | 17:20 |
| glade88 | thats strange | 17:20 |
| LaserJock | not to me | 17:21 |
| LaserJock | i.e. the owner has to set up a list, how a list is used once created is up to admins | 17:21 |
| glade88 | a min | 17:21 |
| LaserJock | but I agree that it's king of on the line between owner and admin territory | 17:21 |
| glade88 | LaserJock: so this is normal behavior? | 17:22 |
| LaserJock | glade88: what do you mean by "normal"? happens to everybody or is the intended behavior? | 17:23 |
| glade88 | oh btw, admins can apply for a mail list | 17:24 |
| glade88 | since when a team doesnt have one | 17:24 |
| glade88 | an admin can request for one | 17:24 |
| glade88 | but its only this specific page that doesnt open | 17:24 |
| glade88 | intended behavior | 17:24 |
| LaserJock | I don't know about intended behavior as I'm not a Launchpad developer | 17:25 |
| glade88 | okay. I'll set up a bug report. If it's normal, it could be marked invalid. Thanks :) | 17:25 |
| === salgado-lunch is now known as salgado | ||
| Rinchen | dsargeant, sure. file an question on it and then ping me | 17:57 |
| Rinchen | dsargeant, I'll verify the bound and move it away | 17:57 |
| exarkun | How do I add announcements or downloads to a project? | 18:08 |
| radix | exarkun: you need a series, and then you need to add a release to that series | 18:09 |
| radix | then when you have those, if you visit the download page as a project admin (or something), you will see a link to upload a new file | 18:09 |
| exarkun | Hm. Ok, thanks. | 18:10 |
| pro-rsoft | what does "deployment" as blueprint status mean? | 18:18 |
| mars | pro-rsoft, for the projects that use it, it usually means that the feature is complete, and it is being rolled out to production/staging/whatever | 18:22 |
| pro-rsoft | does it mean its already committed or its being integrated? | 18:22 |
| mars | pro-rsoft, that depends on the project. | 18:23 |
| pro-rsoft | okay | 18:24 |
| pro-rsoft | thanks | 18:24 |
| LaserJock | Rinchen: ping re: matplotlib | 18:41 |
| Rinchen | go LaserJock | 18:41 |
| LaserJock | Rinchen: John D Hunter responeded | 18:42 |
| LaserJock | but there's confusion | 18:42 |
| Rinchen | LaserJock, ok, keep the conversation going in the question ... | 18:43 |
| Rinchen | LaserJock, state any confusion, etc... | 18:43 |
| Rinchen | that way we have a log of it all | 18:43 |
| LaserJock | well | 18:43 |
| Rinchen | even if it's my confusion | 18:43 |
| Rinchen | :-) | 18:43 |
| LaserJock | the problem is how can LP handle the situation | 18:44 |
| LaserJock | I was trying to not drop the "info" of python2.4-matplotlib, but I think we should use the matplotlib project | 18:44 |
| LaserJock | perhaps we can just manually move info over | 18:45 |
| Rinchen | LaserJock, is it a motu or ubuntu convention question or a question of which project to use for ubuntu? | 18:46 |
| LaserJock | the later sort of | 18:47 |
| LaserJock | IMO, the python2.4-matplotlib project was created in error (general complaint with LP project registering there) | 18:48 |
| LaserJock | but it's actually been used | 18:48 |
| LaserJock | when in reality we *should* be using the "matplotlib" project, and it should be owned by John Hunter, IMO | 18:48 |
| Rinchen | I see | 18:49 |
| LaserJock | so I'd like to transfer the bugs and bzr code import from python2.4-matplotlib to matplotlib so that we don't lose it | 18:49 |
| Rinchen | so, there's an issue with that | 18:49 |
| LaserJock | the easiest way I saw to do it was to rename python2.4-matplotlib to matplotlib, the only question being, I guess, is who's the owner | 18:49 |
| Rinchen | John may not accept it which puts the ubuntu package at risk | 18:50 |
| LaserJock | ??? | 18:50 |
| LaserJock | it doesn't matter! | 18:50 |
| LaserJock | we don't create separate projects for packaging | 18:50 |
| LaserJock | that'd be retarded | 18:50 |
| Rinchen | oh, so you mean file a bug against John's project as if it were upstream? | 18:50 |
| Rinchen | the issue then is how to pass the bugs to his upstream bugtracker | 18:51 |
| LaserJock | that's what it's for! | 18:51 |
| * LaserJock calms down a bit | 18:51 | |
| LaserJock | I'm just in a bit of a hurry, sorry | 18:51 |
| LaserJock | the projects are used to file bugs against upstreams | 18:51 |
| LaserJock | currently the bugs are being filed against the wrong project, IMO | 18:52 |
| LaserJock | and the vcs-import is hosted in the wrong project | 18:52 |
| LaserJock | it should all go to matplotlib | 18:52 |
| LaserJock | this is why I'm not very happy with Launchpad's "let's create a project for everything" push | 18:53 |
| LaserJock | and doubly unhappy that packagers are supposed to create projects just to track bugs | 18:53 |
| Rinchen | LaserJock, right. Ok, so the next move is for hector to agree and then I can get those moved over | 19:08 |
| * Rinchen found a bug on the project screen. | 19:10 | |
| exarkun | Are download stats for files hosted on launchpad available anywhere? | 19:37 |
| nand | Rinchen: hey! any news from the openid drupal plugin testing? | 19:51 |
| Rinchen | nand, nothing more since the email you send to Stu | 19:52 |
| nand | :s | 19:52 |
| rgreening | hey, just wondering if I could get someone to help me merge rgreening with roderick.greening on launchpad. They are both me, but rgreening was an accident and created with wrong email (rgreening@gmail.com is not me - roderick.greening@gmail.com is me). | 20:20 |
| Rinchen | rgreening, yes, if you could please create a question for that, that would be great | 20:26 |
| Rinchen | rgreening, if it's not done by tomorrow, ping me | 20:26 |
| rgreening | Rinchen: where do you want me to do this? | 20:28 |
| rgreening | via LP? | 20:28 |
| Rinchen | rgreening, yes please. | 20:28 |
| Rinchen | assuming you can login of course | 20:29 |
| rgreening | yes, via roderick-greening | 20:29 |
| Rinchen | rgreening, https://answers.edge.launchpad.net/launchpad/+addquestion | 20:29 |
| rgreening | Rinchen: #45990 | 20:32 |
| rgreening | ty | 20:32 |
| Rinchen | thank rgreening. I'm a little busy at the moment. If I don't get to it later today, our on call person tomorrow should | 20:33 |
| Rinchen | or mthaddon or spm might if they free up | 20:33 |
| rgreening | kk | 20:33 |
| === ursula_ is now known as Ursinha | ||
| === thumper_laptop is now known as thumper | ||
| Rinchen | man, that mthaddon is fast. | 20:48 |
| rgreening | lol | 21:01 |
| rsc- | I started my launchpad project (maintained by a team) with a branch in ~myusername. now my teammates can't commit to the branch. how can i fix this? | 21:10 |
| intellectronica | rsc-: why don't you just push the branch as the team? | 21:11 |
| rsc- | how? | 21:11 |
| rsc- | would I be right to just do a "bzr push lp:~dusttheme-dev/dusttheme/trunk" (dusttheme-dev as the team name) and under the web interface, do a "link to branch" to change it to that path? | 21:12 |
| LarstiQ | rsc-: certainly yes to the bzr push lp:<team>/<project>/<branch> | 21:30 |
| LarstiQ | rsc-: I don't know what 'link to branch' is about, so I'll refrain from commenting on that | 21:31 |
| rsc- | woudl you guys recommend using Bazaar VCS for personal (one-person) projects? | 21:45 |
| mwhudson | rsc-: definitely | 21:46 |
| rsc- | mwhudson, if i do that (just working locally), how should i make branches? | 21:46 |
| mwhudson | um, the usual ways? | 21:47 |
| mwhudson | bzr push, bzr branch | 21:47 |
| rsc- | how? | 21:47 |
| rsc- | sorry im new to this :) | 21:47 |
| mwhudson | bzr init to start | 21:47 |
| rsc- | bzr init / bzr add / bzr commit | 21:47 |
| rsc- | lets say i've done those, and made some changes, and i'm ready to "branch" out to another branch (for testing) | 21:48 |
| mwhudson | rsc-: http://doc.bazaar-vcs.org/bzr.dev/en/mini-tutorial/index.html | 21:48 |
| mwhudson | rsc-: bzr push ../testing will create a new branch | 21:48 |
| rsc- | omg wow cool | 21:49 |
| rsc- | sorry, i come from SVN, so I'm still used to the whole "big repo in the sky" thinking :P | 21:50 |
| rsc- | can i "switch" branches? | 21:50 |
| rsc- | if that makes sense... | 21:50 |
| mwhudson | well, i know one sense in which you can :) | 21:51 |
| rsc- | how? | 21:51 |
| rsc- | aside from the obvious "cd ../testing" of course | 21:51 |
| mwhudson | well, it requires a bit more set up | 21:52 |
| mwhudson | bzr divides up the concepts of "working tree", "branch" and "repository" | 21:52 |
| mwhudson | working tree == the files you edit, like svn | 21:52 |
| mwhudson | branch = 'ordered sequence of revisions' | 21:52 |
| mwhudson | repository = 'where data is stored' | 21:53 |
| mwhudson | so what you can do is have a repo at project-repo | 21:53 |
| rsc- | yeah, I can see how those terms can differ between svn/git/bzr/etc... | 21:53 |
| mwhudson | branches at say project-repo/trunk | 21:54 |
| mwhudson | project-repo/testing | 21:54 |
| mwhudson | then a 'lightweight checkout' in say working | 21:54 |
| mwhudson | then in the checkout you can say | 21:54 |
| rsc- | i see | 21:54 |
| mwhudson | bzr switch testing | 21:54 |
| rsc- | basically bzr doesn't have much of a "repository" (that houses many branches/tags) in the SVN sense | 21:55 |
| rsc- | because each branch is independent | 21:55 |
| rsc- | would I be correct about that? | 21:55 |
| exarkun | rsc-: a repository is an optimization | 21:55 |
| rsc- | optimization? | 21:57 |
| rsc- | btw, whats the difference between a checkout and a pull? | 21:58 |
| exarkun | http://bazaar-vcs.org/CheckoutTutorial :) | 21:58 |
| rsc- | okay | 21:59 |
| rsc- | hmm | 21:59 |
| rsc- | so if i make a branch of an LP project (bzr branch lp:xxxxx), and i make local commits (say, 10), then I do a push... will that make 10 commits to the branch on LP? or just 1? | 21:59 |
| exarkun | 10 | 21:59 |
| rsc- | why is that/ | 22:00 |
| rsc- | what if i just want to do one commit? | 22:00 |
| exarkun | because push is just a way to put the data somewhere else | 22:00 |
| exarkun | it's not really right to say you make "10 commits" or "1 commit" | 22:00 |
| exarkun | you already did the commits, they're over | 22:00 |
| exarkun | you're adding 10 revisions | 22:00 |
| exarkun | if you'd rather add 1 revision, then you probably want to merge instead | 22:00 |
| rsc- | oops, revisions. | 22:01 |
| rsc- | so does that mean when I do a "bzr merge lp:xxx", and my copy is more up-to-date, the lp:xxx branch will be the one to be udpated? | 22:02 |
| exarkun | no, since 'bzr merge x' merges 'x' into the wc at your cwd | 22:03 |
| rsc- | okay | 22:03 |
| rsc- | so if I made 10 new revisions on my local branch, how can I update the remote branch with just one consolidated revision? | 22:03 |
| exarkun | not sure what the best thing to do is. you could branch the remote again, merge the first branch into the second, then commit the merge and push it back to remote | 22:04 |
| exarkun | there might be a way to do the same thing in fewer steps. | 22:04 |
| rsc- | i see | 22:05 |
| rsc- | hmm. | 22:06 |
| rsc- | whats the difference between "bzr update" and "bzr merge"? | 22:06 |
| exarkun | tons | 22:06 |
| rsc- | dont they do the same basic thing -- update your copy with the changes from the remote? | 22:08 |
| beuno | merge can bring in changes from any branch | 22:08 |
| beuno | update just updates your branch from it's parent | 22:08 |
| rsc- | okay | 22:09 |
| rsc- | but if I do a bzr merge [parent] | 22:09 |
| rsc- | would that be functionally equivalent? | 22:09 |
| beuno | nope | 22:09 |
| beuno | that would make all merged revisions part of 1 in the mainline | 22:09 |
| beuno | update makes your branch look exactly like the remote | 22:09 |
| rsc- | oh. | 22:09 |
| rsc- | discarding your changes. | 22:09 |
| rsc- | your commited and uncommited changes | 22:10 |
| rsc- | ...correct? | 22:10 |
| beuno | I'm pretty sure you can't update a modified branch | 22:10 |
| rsc- | erm, ok | 22:11 |
| exarkun | it doesn't discard your commited changes, though. | 22:11 |
| exarkun | it might result in a conflict that you have to resolve. | 22:11 |
| beuno | if you update a branch, it's probably because it's a checkout | 22:12 |
| rsc- | okay | 22:12 |
| beuno | si, whatever you committed, it's parent laready has it | 22:12 |
| beuno | (my typing is horrible today) | 22:12 |
| beuno | the other use for update is to update the working tree, but that's a different workflow we really don't want to get into now :) | 22:12 |
| rsc- | so if i branch out from a remote branch (bzr branch lp:xxx), "bzr update" will not contact the remote branch..? | 22:12 |
| beuno | nope | 22:13 |
| rsc- | because it's a branch and not a checkout? | 22:13 |
| beuno | you have to do: bzr pull | 22:13 |
| beuno | yeap | 22:13 |
| beuno | it's SVN-like | 22:13 |
| beuno | (checkouts) | 22:13 |
| rsc- | okay. | 22:13 |
| rsc- | oh no, pull vs. checkout -- thats somethign else ive gotta read on | 22:14 |
| beuno | rsc-, http://doc.bazaar-vcs.org/latest/en/mini-tutorial/index.html | 22:14 |
| beuno | http://doc.bazaar-vcs.org/latest/ | 22:14 |
| beuno | has tons of valueable information | 22:14 |
| rsc- | the mini guide doesn't mention anything about pulling or checking out | 22:15 |
| rsc- | but ill check the main docs | 22:15 |
| rsc- | can i make a diff patch from the changes of HEAD against HEAD-1? | 22:16 |
| rsc- | (not sure about the terminology here but i hope htat puts the idea across) | 22:16 |
| beuno | yeap | 22:16 |
| beuno | bzr diff -r -2 | 22:17 |
| rsc- | cool | 22:17 |
| === Verterok is now known as Verterok|out | ||
| LarstiQ | beuno: that would be against working tree, no? | 22:25 |
| LarstiQ | rsc-: in case that matters, bzr diff -r -2..-1 or bzr diff -c -1 | 22:26 |
| LarstiQ | rsc-: or if you wanted it the other way around, -r -1..-2 | 22:26 |
| rsc- | hmm | 22:29 |
| beuno | LarstiQ, it is. I'm assuming he has one | 22:31 |
| === bac is now known as bac_afk | ||
| === ajmitch_ is now known as ajmitch | ||
| === Verterok|out is now known as Verterok | ||
| === salgado is now known as salgado-afk | ||
| === matsubara is now known as matsubara-dinner | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!