| dust_o | i'm in a pickle. i did a commit, for the sake of example, to a revision 2. then did a push. then discovered i would like to revert to previous revision 1. so did a 'bzr uncommit' and a 'bzr revert'. however, launchpad still shows revision 2 for the project. if i try to then add a new revision 2, bzr complains about divergent branch. cannot figure out how to unpickle myself. | 01:47 |
|---|---|---|
| mwhudson | dust_o: push --overwrite | 01:49 |
| dust_o | thank you so much! | 01:50 |
| dust_o | oh man. can i buy you a pizza or something? | 01:51 |
| mwhudson | heh, i can cope :) | 01:52 |
| dust_o | well, thank you. was a'feared for my job 8) hehe | 01:53 |
| maxb | Is there anyone who actually understands builddeb's DistributionBranch? | 06:56 |
| maxb | I'm currently annoyed with it because its comments apparently lie | 06:56 |
| jelmer | maxb: hi | 07:01 |
| maxb | hi | 07:01 |
| jelmer | maxb: sure, I have a vague idea of what it does | 07:02 |
| maxb | So, DB claims : | 07:02 |
| maxb | You can only import packages on to the DistributionBranch | 07:02 |
| maxb | if both tree and pristine_upstream_tree are provided. | 07:02 |
| maxb | But the main UDD codepath doesn't do that, and I'd venture to say it generally imports packages :-) | 07:02 |
| jelmer | yeah, the pristine tree is no longer strictly necessary IIRC | 07:04 |
| maxb | The other thing I'm having problems with is understanding why various callsites pass 1 branch / 2 branches / 2 branches + 1 tree / 2 branches + 2 trees | 07:06 |
| maxb | "Tree or not" makes sense - am I going to be importing things | 07:06 |
| maxb | Also, the only non-test callsite which passes 2 branches which aren't the same branch object appears to be UDD's check_same | 07:07 |
| jelmer | maxb: the two branches are the packaging brnach and the pristine source branch | 07:08 |
| jelmer | which often aren't the same thing | 07:08 |
| maxb | They appear to be the same thing in every callsite I've found apart from check_same | 07:08 |
| maxb | And in that callsite they're merely a scratch empty branch in both cases | 07:10 |
| jelmer | the tip of the pristine tar branch can matter in some cases | 07:14 |
| maxb | *ah* pristine_upstream_tree sometimes gets assigned via extract_upstream_tree not via the DB __init__ | 07:15 |
| maxb | although when that happens, pristine_upstream_source doesn't get updated equivalently | 07:16 |
| maxb | Oh, except PristineTarSource genuinely doesn't use its self.tree at all | 07:20 |
| maxb | I wonder if we could remove that, or if it's immutable API at this point | 07:21 |
| jelmer | maxb: we can't, not without a lot of refactoring | 07:22 |
| jelmer | maxb: I've tried in the past | 07:22 |
| maxb | Refactoring in which projects? | 07:23 |
| jelmer | bzr-builddeb | 07:23 |
| maxb | Oh, you mean because its needed as part of the contract of an UpstreamSource, but not otherwise? | 07:24 |
| maxb | no, that doesn't make sense | 07:25 |
| jelmer | hmm, actually - it looks like my changes actually landed | 07:26 |
| jelmer | so I think it can indeed go | 07:26 |
| * maxb asks the tests what they think :-) | 07:29 | |
| maxb | I wonder if DistributionBranch is used anywhere but builddeb and udd - i.e. what leeway we have in API changes | 07:31 |
| maxb | builddeb's tests pass with PristineTarSource's tree removed | 07:31 |
| maxb | To double back to an earlier point: "the two branches are the packaging brnach and the pristine source branch which often aren't the same thing" - do you know of an example? | 07:33 |
| maxb | oh this is getting horrit | 07:40 |
| maxb | After an extract_upstream_tree, DB.pristine_upstream_branch has changed into the result of sprouting from itself | 07:40 |
| maxb | I wonder if I could make it so that DistributionBranch __init__ took a single mandatory branch and a single optional tree ONLY | 07:42 |
| maxb | Hmm. It almost looks as if a tree.lock_write() and a branch.lock_write() are conflicting | 07:58 |
| maxb | But for that to happen, the tree would have to be pointing at the same on-disk branch via a different Branch object, wouldn't it? | 07:58 |
| maxb | Time to set up a staging importer with some extra logging, I guess | 08:00 |
| maxb | # Should we just dump the upstream part on whatever is currently | 08:02 |
| maxb | # there, or try and pull all of the other upstream versions | 08:02 |
| maxb | # from lesser branches first? For now we'll just dump it on. | 08:02 |
| maxb | # TODO: this method needs a lot of work for when we will make | 08:02 |
| maxb | # the branches writeable by others. | 08:02 |
| maxb | lovely | 08:02 |
| mgz | morning | 08:04 |
| jam | mgz: /wave | 08:15 |
| mgz | who's handling contributor agreements for bzr atm? | 15:57 |
| fullermd | NFC. I'd guess it would be either jam or jam would know, so... | 17:16 |
| mgz | I shall squish the jam tomorrow. | 17:18 |
| david0rk | Hi all | 21:25 |
| === yofel_ is now known as yofel | ||
| jelmer | hi david0rk | 21:26 |
| david0rk | Hi Jelmer | 21:26 |
| david0rk | are you familiar with bazaar? | 21:27 |
| jelmer | david0rk: sure | 21:42 |
| david0rk | I've got launchpad setup (account, rsa_pubkey, ssh key) and i've set a folder on my pc as a bazaar tree. | 21:48 |
| david0rk | Now I just need to figure out how to get my sourcecode in bazaar, and push to launchpad. | 21:48 |
| david0rk | nevermind. I figured out using a bit of common sense and tinkering. BAZAAR IS AWESOME! | 22:22 |
| === yofel_ is now known as Guest77193 | ||
| === SpamapS_ is now known as SpamapS | ||
| === jelmer_ is now known as jelmer | ||
| === elmo_ is now known as elmo | ||
| === bob2_ is now known as bob2 | ||
| === Noldorin__ is now known as Noldorin | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!