| goddard | i was curious if bzr was a good choice for version control for website development? | 01:52 |
|---|---|---|
| goddard | I want to have a dev site and a live site kind of a two step process | 01:53 |
| bob2 | that's fine in any vc system | 01:53 |
| bob2 | note that none of the free dvcs systems handle huge binary files well | 01:53 |
| mgrandi | is there a way to | 04:46 |
| mgrandi | view diffs in a better way? like having the 'complete' file along with the diff? | 04:46 |
| === r0bby is now known as robbyoconnor | ||
| LarstiQ_ | mgrandi: you can do that right now? | 06:52 |
| mgrandi | what do you mean? | 06:52 |
| mgrandi | as in i have a diff on launchpad | 06:52 |
| mgrandi | but its not the complete file... | 06:52 |
| mgrandi | and its a conflict, so i need to have the entire file to see what i'm changing | 06:52 |
| LarstiQ_ | mgrandi: ah, viewing on launchpad | 06:53 |
| LarstiQ_ | mgrandi: I don't know about that, but I would work with a local branch | 06:53 |
| mgrandi | well it is a local branch, a branch of the bzr source code, but it ahd conflicts merging with 2.5 , now trunk i guess | 06:53 |
| LarstiQ_ | mgrandi: so say you have two branches original/ and modificiation/ next to each other, `cd modification; bzr diff -r ancestor:../original` to get a diff in the style launchpad gives you | 06:54 |
| LarstiQ_ | mgrandi: and then use your editor to view the diff and the original file | 06:55 |
| mgrandi | ah. | 06:55 |
| LarstiQ_ | mgrandi: alternatively, you could try qdiff from qbzr | 06:55 |
| mgrandi | will that load a diff file? | 06:55 |
| LarstiQ_ | mgrandi: nafaik, but it will generate and show diffs | 06:56 |
| mgrandi | hmm =/ | 06:57 |
| LarstiQ_ | mgrandi: hmm? | 06:57 |
| mgrandi | well is there some program that shows the diff like qdiff does? cause i like having the user inferface part of that as its easier | 06:58 |
| mgrandi | cause i can apparently download the diff file: https://code.launchpad.net/~markgrandi/bzr/gpg_devttynotfound_fix/+merge/93144 | 06:58 |
| LarstiQ_ | mgrandi: so if I branch lp:~markgrandi/bzr/gpg_devttynotfound_fix and run `bzr diff -r ancestor:../2.5` the diff comes up clean | 07:08 |
| mgrandi | ok. thanks =) | 07:09 |
| mgrandi | new to diff files and whatnot. | 07:09 |
| mgrandi | (not the idea just working with em) | 07:09 |
| LarstiQ_ | mgrandi: in this case it looks to me like launchpad generated the diff at an inopportune time or some such | 07:09 |
| mgrandi | well it did it before 2.5 was frozen | 07:10 |
| mgrandi | i was just busy and trying to figure out how to view the entire file so i didn't break things | 07:10 |
| * LarstiQ_ nods | 07:10 | |
| mgrandi | and it was sketchy anyway since it was proposed for merging at 2.5b6 | 07:10 |
| LarstiQ_ | mgrandi: it can still go into the 2.5 branch even if it doesn't make 2.5.0, imo | 07:11 |
| LarstiQ_ | mgrandi: so with that in mind, the merge conflicts are resolved. Only thing left is a news entry :) | 07:11 |
| mgrandi | yeah. thats actually a question i have about bzr's development (and i guess in development in general), if that gets fixed in 2.5, does it have to be applied to trunk as well? | 07:12 |
| LarstiQ_ | mgrandi: it will be included in trunk automatically next time someone merges 2.5 | 07:12 |
| === LarstiQ_ is now known as LarstiQ | ||
| mgrandi | ah ok. so i'll fix it up tonight once i finish this thing | 07:13 |
| LarstiQ | mgrandi: news entry goes in doc/en/release-notes/bzr-2.5.txt btw | 07:14 |
| mgrandi | thanks | 07:15 |
| mgrandi | so just fix the merge and add something in that file? | 07:15 |
| LarstiQ | mgrandi: merge already looks fine to me, so just add an entry to that file | 07:16 |
| mgrandi | isn't the merge conflicted? | 07:16 |
| mgrandi | thats what it says to me on launchpad | 07:16 |
| LarstiQ | mgrandi: locally it was fine, that beats what launchpad says | 07:17 |
| mgrandi | haha | 07:17 |
| mgrandi | ok then | 07:17 |
| LarstiQ | mgrandi: if you do get into trouble you can blame me and I'll fix it for you ;) | 07:17 |
| mgrandi | k =P | 07:17 |
| mgrandi | and LarstiQ i updated it with the news entry. thanks again =) | 09:13 |
| LarstiQ | mgrandi: np, thanks for the work! | 09:18 |
| mgrandi | all 5 characters of it haha | 09:18 |
| LarstiQ | mgrandi: every bit of help is welcome :) | 09:20 |
| LarstiQ | mgrandi: I commented on the mp, it does seem I was not quite awake yet | 09:26 |
| mgrandi | haha. ok | 09:26 |
| LarstiQ | mgrandi: as said I can fix that up, and/or I can tell you how to deal with it | 09:26 |
| mgrandi | whats the command to show the full diff? im pretty sure its just a small change | 09:27 |
| LarstiQ | mgrandi: basically, and what I should have realized, is that lp does: `cd 2.5; bzr merge ../gpg_devttynotfound_fix` | 09:27 |
| LarstiQ | mgrandi: because we are merging _into_ 2.5 | 09:28 |
| mgrandi | ah, not the other way around. | 09:28 |
| * LarstiQ nods | 09:28 | |
| LarstiQ | mgrandi: so if you do that and then do `bzr qdiff`, it will show you the same output | 09:28 |
| mgrandi | k let me do that real fast | 09:28 |
| LarstiQ | mgrandi: then under View Options you can toggle Complete to see the entire file | 09:29 |
| mgrandi | k got it | 09:31 |
| mgrandi | let me fix thisss | 09:32 |
| LarstiQ | mgrandi: I need to clear out an apartment and prepare for a talk. I'll check back later to see how things are going | 09:35 |
| mgrandi | kk! | 09:35 |
| LarstiQ | mgrandi: so feel free to highlight me on irc for any questions you run into | 09:35 |
| * LarstiQ away | 09:37 | |
| mgrandi | LarstiQ, well i finished resolving the conflicts, now what do i do, do i push to the gpg_devttynotfound_fix branch? or do i commit the merge of my machine and push that somewhere? | 09:59 |
| mgrandi | LarstiQ, you can tell me and i'll do it later, now its bedtime~ | 10:22 |
| === mgrandi is now known as mgrandi|sleep | ||
| Carletto | ciao | 11:20 |
| Carletto | !list | 11:20 |
| ubot5 | No warez here! This is not a file sharing channel (or network); read the channel topic. If you're looking for information about me, type « /msg ubottu !bot ». If you're looking for a channel, see « /msg ubottu !alis ». | 11:20 |
| LarstiQ | mgrandi|sleep: after resolving the conflicts: commit, push, update merge proposal | 13:06 |
| LarstiQ | mgrandi|sleep: that last one might happen automatically, I'm a bit vague on what launchpad does nowadays | 13:09 |
| === yofel_ is now known as yofel | ||
| === mathrick__ is now known as mathrick | ||
| * jelmer waves | 17:56 | |
| LarstiQ | hey jelmer | 17:57 |
| jelmer | hey LarstiQ, how's it going? | 17:58 |
| LarstiQ | jelmer: stuck on talk preparations | 17:59 |
| LarstiQ | jelmer: how about you? | 17:59 |
| jelmer | LarstiQ: what are you going to talk about? | 17:59 |
| jelmer | LarstiQ: trying to clean up my digital garbage | 18:00 |
| LarstiQ | jelmer: tensor products mostly | 18:00 |
| jelmer | ah, uni stuff? | 18:00 |
| LarstiQ | jelmer: yup | 18:01 |
| wgz | jelmer: ah, see your email (on the bzr list too) | 18:17 |
| wgz | we have a GSoC enquiry | 18:17 |
| wgz | you might have some useful points to add being a veteran | 18:19 |
| jelmer | wgz: heh, I'm not sure if veteran is the right word :) | 18:39 |
| wgz | expert? maven? guru? | 18:44 |
| jelmer | wgz: euhm, let's stick with veteran :) | 18:48 |
| LarstiQ | jelmer: "ervaringsdeskundige" | 18:51 |
| jelmer | hehe | 18:59 |
| mgrandi|sleep | LarstiQ, now that i'm awake haha, i'm confused on commiting, cause since i did the merge, it says that if i commit then i do the merge locally, do i do that and then push to gpgdevttywhatever branch? | 19:12 |
| wgz | mgrandi|sleep: yes | 19:13 |
| wgz | basically the stages are: pull latest 2.5, merge local 2.5 into local gpgdev, resolve conflicts in files, commit, push gpgdev | 19:14 |
| mgrandi|sleep | ok. its just weird since i'm pushing the 2.5 branch into the gpgdev one, i'll do that | 19:15 |
| LarstiQ | mgrandi|s: I think the answer is yes, though what says you're doing the merge locally? | 19:15 |
| mgrandi|sleep | well you told me to cd 2.5, bzr merge ../gpgdevttynotfound_fix | 19:16 |
| mgrandi|sleep | to get it so it would generate the merge conflict stuff | 19:16 |
| LarstiQ | mgrandi|sleep: aye | 19:17 |
| mgrandi|sleep | so then, now i commit to the 2.5 branch the 'merge' of the gpgdevtty branch, and then do i just push that to the one on launchpad? | 19:17 |
| LarstiQ | mgrandi|sleep: push the result to gpgdev, yes | 19:19 |
| * LarstiQ is being dense today | 19:20 | |
| LarstiQ | mgrandi|sleep: that should be it | 19:20 |
| mgrandi|sleep | kay. just seems weird that i merge it, push to that branch and then launchpad i guess will merge it with 2.5 when its already merged | 19:20 |
| LarstiQ | mgrandi|sleep: yeah, it is a bit overkill in this case (even if you had done what wgz said instead of what I said) | 19:21 |
| mgrandi|sleep | ah | 19:22 |
| LarstiQ | mgrandi|sleep: with larger branches, the danger lurks that fixing the merge conflicts needs knowledge of what was done | 19:22 |
| mgrandi|sleep | yeah that makes morse sense | 19:22 |
| LarstiQ | mgrandi|sleep: in which case it is safer to have the original author do it, insteadd of the integrator. Hence why poolie asked for it | 19:23 |
| mgrandi|sleep | yeah | 19:23 |
| mgrandi|sleep | next time i'll merge 2.5 into the whatever branch and commit that, that seems to make more sense hehe | 19:24 |
| mgrandi|sleep | when i do this again | 19:24 |
| LarstiQ | mgrandi|sleep: indeed, sorry for my density today :) | 19:24 |
| mgrandi|sleep | nah its fine, just trying to understand the workflow~ | 19:24 |
| * LarstiQ nods | 19:25 | |
| mgrandi|sleep | and i pushed it | 19:25 |
| LarstiQ | mgrandi|sleep: and the diff on launchpad is clean now too, cheers! | 19:27 |
| mgrandi|sleep | yayyyy | 19:29 |
| wgz | approvéd | 19:34 |
| mgrandi|sleep | kk | 19:37 |
| mgrandi|sleep | and now i eat food~ | 19:37 |
| LarstiQ | aand bedtime | 20:02 |
| wgz | night! | 20:03 |
| wgz | ...I think I won't try and review Jelmer's 3596 line diff this evening | 21:46 |
| jelmer | wgz: :) | 21:47 |
| jelmer | it's all simple renames :) | 21:47 |
| jordi | hey | 21:53 |
| jordi | quick bzr newbie question | 21:53 |
| jelmer | hi | 21:53 |
| jordi | I have a few changes on a bzr branch of lp:intltool | 21:53 |
| jordi | what's the "lp way" of sending this diff to danilo? | 21:53 |
| jelmer | jordi: #launchpad is probably a better channel for this sort of question | 21:54 |
| jelmer | jordi: basically, commit the changes, push it to launch ("bzr push lp:~/intltool/branch-name") | 21:54 |
| jelmer | jordi: and then propose a merge ("bzr lp-propose") | 21:54 |
| jordi | jelmer: thanks | 21:56 |
| jordi | I think something went a bit differently than expected | 21:56 |
| jordi | Using default stacking branch /+branch-id/41904 at chroot-94560208:///~jordi/intltool/ | 21:56 |
| jelmer | that's correct | 21:56 |
| jordi | jelmer: that's the name of my branch? It was meant to be manpage-fixes :) | 21:57 |
| jelmer | no, that's just saying what your branch is stacked on | 21:58 |
| jordi | jelmer: hm, once pushed, there's no way of changing a commit message, right? :) | 21:58 |
| wgz | jordi: you can, especially if you've not told anyone else to get your branch yet | 22:00 |
| jordi | geez, python-launchpadlib has a few dependencies | 22:00 |
| jordi | wgz: not yet, no | 22:00 |
| wgz | uncommit locally, commit with fixed message, then push --overwrite | 22:00 |
| jordi | wgz: worked great, thanks! | 22:05 |
| jordi | jelmer, wgz, thanks for the tips | 22:05 |
| jelmer | np :) | 22:07 |
| poolie | hi all | 22:35 |
| jelmer | hi poolie | 23:00 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!