mkanat<dwm> we're going through The Great DVCS Debate (Summer 2010 Edition) now, I have noticed the bazaar/subversion integration is way ahead of other DVCS offerings00:18
mkanat^^^^^^^^^^ That's Yahoo.00:18
GungaDinin revisionspec, does 'ancestor' relate to any common revision? or a common branch?02:34
wgrantGungaDin: Common revision.04:19
=== lifeless_ is now known as lifeless
mtaylor$ bzr push --no-stacked lp:~ozone-core/ozone/devel07:28
mtaylorUsing default stacking branch /~ozone-core/ozone/spm-test at lp-70455952:///~ozone-core/ozone07:28
mtaylorum. o hai --no-stacked07:28
parthmhello. is 2.2b4 feature freeze or is it 2.2rc1? ... i am asking in the context of any new merge proposals.08:03
vilaparthm: AIUI the feature freeze is already in effect08:19
parthmvila: ok. thanks. so the trunk is for 2.3 now?08:20
=== parthm_ is now known as parthm
vilaparthm: ha, the tricky one :) I'd say no, but you should ask the RM !08:38
jamparthm: 2.2b4 isn't a strict feature freeze, but it *is* an api freeze08:39
jamso that plugins can stabilize for the 2.2rc1 in a month08:39
jamhowever, if we need to, we can split 2.2 off08:40
jamI'll ask poolie what he thinks08:40
jamwe certainly want to avoid waiting on landing code08:40
jamparthm: poolie finalizes, trunk is now 2.308:40
jamI'll submit a patche08:40
parthmjam: ok. thanks for clarifying. one more question. should patches be submitted against trunk and proposed against 2.2 on a case by case basis? or (if they don't break api) they should be proposed against 2.2 branch and merged into trunk for now?08:42
parthmlooks like i may need to rework the news entry for https://code.launchpad.net/~parthm/bzr/603461-ensure-no-var-named-message/+merge/29624 :P and propose it again.08:44
poolieparthm, jam, yes, features that don't break apis and aren't too risky are welcome08:45
jamparthm: if you think it is safe for 2.2, propose it there08:45
jam2.x is always merged up into trunk08:46
jamso it saves having multiple proposals08:46
parthmpoolie, jam: ok. i will do that. thanks.08:46
=== Meths_ is now known as Meths
=== CardinalFang_ is now known as CardinalFang
=== Cardinal` is now known as CardinalFang
=== beuno is now known as beuno-lunch
JoshBrownI'm working with Bazaar on Launchpad and was wondering how the branch, change, commit, merge process goes? Currently I am pulling from the branch, working on it, then pushing it back, is this 'best practice'?17:14
rubbsJoshBrown: that is one way of doing it. There is no one right way to do it, but what I tend to do is pull one down and have it as my "mirror" of the LP branch. then I branch from my local one and hack away. When I want to get it into lp I push/merge to the local one and push up to LP.17:16
rubbsthe reason i do this is if I want two or more branches from the same lp branch17:16
rubbsit also allows for the mirror to keep up to date in case your work is taking a while.17:18
rubbsbut others here might offer a different workflow17:18
JoshBrownrubbs: Great, I finally did something right! :)17:18
JoshBrownrubbs: For some reason I thought that maybe merges were supposed to be done on the Launchpad end.17:19
rubbsJoshBrown: usually not. Merges are easier to do locally and then push to lp17:19
rubbsJoshBrown: the mirror approach also keeps all your history in line with the LP branch rather than jumping back and forth between branches17:20
rubbsJoshBrown: in other words, the mirror/LP history is always on the left (first one seen) and the working branches are on the right (seen after you expand this history at the merges)17:20
JoshBrownrubbs: Yeah, I'm glad you can merge locally for ease of use / keeping in sync. It's just the fact that merge /proposals/ are done on Launchpad that threw me off.17:22
rubbsJoshBrown: well merge proposals are slightly different.17:23
rubbsJoshBrown: LP's MPs are for branches you don't have commit access too. So you can clone/branch from them, but you won't be able to push to it.17:23
rubbsin this case you submit a proposal and have a link to your branch and someone with commit access can merge it in for you (provided they accept it)17:24
JoshBrownrubbs: Ah, so if you have access to the branch you don't bother with a merge proposal? Got it.17:25
rubbsJoshBrown: you don't have to IIRC, but it may be good practice if you wish to have a process in place17:25
=== beuno-lunch is now known as beuno
MethsIf you run bzr uncommit on a tree are the bzr pull references it gives you good for the life of the tree or can doing the wrong thing break those?18:50
MethsIt think my real question is can you run bzr revert after doing uncommit so you have a completely clean revision and then apply those pull commands?18:50
pooliethey will last within that repostiroy18:51
poolieMeths, why would you want to do that?18:51
MethsFor some reason one of our devs had content conflicts doing a bzr update on their version of trunk.  They ran uncommit forgetting it would affect the lp copy but whatever caused the conflicts (which didn't show up on lp or others trees) shows in their bzr st18:53
MethsSo could they just revert so that they have a clean bzr st then run the bzr pull commands to reapply the uncommits and see if that cleans it up?18:54
poolieif they didn't like the conflicts they probably should have just reverted, i think18:56
MethsPossibly, it still isn't clear how you can get content conflicts just running bzr update every so often on a checkout from lp so not sure what they could have done to their copy.18:58
pooliewhen you update, it merges the upstream changes against your uncommitted changes18:59
Methspoolie: Exactly, normally our workflow means you wouldn't make any changes directly in the trunk checkout.  I'll ask them if they may have done.  In the meantime we'll do the bzr revert to get it clean and run the pulls.19:01
pooliejust for curiousity, which project?19:02
Methspoolie: will those pull references be in a fresh checkout from lp?19:04
maxbMeths: I believe they will _not_ because they won't be in the ancestry of the branch head. However, a subsequent attempt to refer to them might pull them from the lp branch at that time19:17
Methsmaxb: Thanks.  They seemed to be though and all is fixed now.  I assume as the uncommit happened on the lp copy as well, the references were also stored there.19:19
[reed]does bzr support pulling a repo within a repo? as in, I have a top level "server" repo, but within that repo, I want the "extensions" directory to pull from another repo (similar to svn:externals)19:35
[reed]as the extensions apply to more than just this one server19:35
bbutzit is possible to cherry pick multiple files when merging? I have an intermediate branch, and want to merge files that are across multiple revisions of another branch into it20:04
=== mm-mysql is now known as mark|autoconnect
=== Adys_ is now known as Adys

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