[07:24] hey guys [07:24] anyone around [07:24] ? [07:26] hello jam [07:26] Can someone please tell me, when I make a push to a branch and it makes some automated merges leaving messages inside the actual files [07:27] How do I detect those in the branch? it's messing up my code and I want to resolve it [07:27] Wiz-KeeD: we don't ever "automated merge" when doing push. Do you mean during "bzr merge" ? Or "bzr pull" ? [07:27] you shouldn't push to things with working copies [07:27] generally, you use "bzr status" [07:28] bob2, i shouldn't? [07:28] hmmm.. maybe we do with local push, that was a special case [07:28] That's how I deploy my code to the server [07:28] it in fact refuses by default [07:28] Wiz-KeeD, that's a terrible idea [07:28] bob2 how so? what would be your suggestion? [07:28] to transfer the local code to the server [07:28] because of the above [07:28] i just use bzr push-and-update [07:28] that's it [07:28] also the fact that you /edited things on the server/ [07:29] then pushed upon it [07:29] hmm I might have done that but did revert --no-backup [07:29] Then what would be the ideal solution? [07:30] let me guess [07:30] php? [07:30] wrong guess :)) [07:30] python [07:31] deploying python via this method is absurd [07:31] since you're missing the './bin/python setup.py develop' or './bin/pip install -e .' step [07:32] I don't understand [07:34] I deploy personal code to a server regarding modules of a framework that get loaded by that framework on the server [07:34] And any changes I make and test locally I will eventually have to push onto the server for production [07:35] Might not be the best method but I don't see how that is absurd really, maybe I'm missing something === _thumper_ is now known as thumper [23:40] hello. i have a large branch that i do not want to re-clone from launchpad. i made changes in this branch and pushed them to LP, then submitted a merge, and it was approved [23:41] now, i want to start from a pristine trunk, and do a bzr merge from lp:~achiang/project/proposed-branch [23:41] and then push the merged trunk to lp:project [23:41] is there a way to get back to "trunk" using my local, modified branch? [23:42] Was it branched off trunk in the first place? [23:42] yes [23:42] Try pull. [23:42] ? [23:43] so bzr pull lp:project ? [23:43] inside the modified branch? [23:43] Just bzr pull should be enough. [23:43] i get "no revisions or tags to pull" [23:44] See what bzr missing lp:project has to say. [23:45] simply says that my local branch has 5 extra revisions, but trunk has not changed since i last cloned/pulled [23:45] Mmm. OK, let me check this then. [23:46] You branched lp:project, then made 5 commits on top of it. Pushed them to lp:~achiang[...]. [23:46] i suppose i could just push to lp:project, but something weird in me wants to ensure that trunk gets a merge commit... [23:46] Now you want to take a prisine lp:project, merge lp:~achiang[...] into it, commit the merge, then push that? [23:47] fullermd: yes you understand correctly. is that weird for me to want? [23:47] Eh. Not particularly. 6.5 of one, half a baker's dozen of the other. [23:48] in git, it would resolve to the same thing anyway... what they call a fast forward merge (or whatever) [23:48] The q&d answer is probably do to a pull --overwrite to force your local branch back to pure trunk, then do the merge/ci/push. [23:48] but i guess i'm used to seeing merge commit in bzr workflows [23:48] oh, nice. i'll do the --overwrite [23:48] Naturally. 'cuz bzr may have smoked whatever git was on, but it didn't inhale ;p [23:50] ugh, that screwed up my tree [23:50] because i had stuff in a subdirectory that wasn't tracked by bzr [23:50] If it's gonna be a long-term repeated action, better solution would be to setup a local shared repo and keep one branch as pristine trunk, using additional locals for the work branches. [23:51] yah. that's what i'm about to do [23:51] Precious stuff? [23:52] If not, you can just do some rm and/or revert dancing. [23:52] i'm recovered now... rm -rf subdir/ ; bzr revert ; bzr status => clean :) [23:52] I said it first! That means I still get the credit! [23:53] i can show you my bash history timestamped to an ntp-synced machine :P [23:54] * achiang now does cd .. ; mv local trunk ; bzr branch trunk local [23:54] fullermd: thanks for the help, much appreciated [23:54] I'd setup the repo first, to save all the I/O on your poor disk. [23:55] it was ok. only took a few seconds for the local branch [23:55] I blame the TAI/UTC offset for that vile attempt to snake the credit away from me. Durn leap seconds. [23:55] the reason the branch is huge is because of media files in the tree [23:55] i guess that was fast enough to clone locally [23:55] that, plus PCIe SSD [23:55] Well, it's doubling the repo space used. [23:56] (since it's now storing the whole history twice) [23:56] oh, i see [23:56] One shared repo will stop that. Plus make any future "branch lp:project/whatever"'s way faster, since they'd only need to grab revs you don't already have. [23:56] got it [23:57] init-repo to set it up, then reconfigure --use-shared in the branches to switch them over to using it.