| === mark06 is now known as mark06-away | ||
| jelmer | SamB_MacG5: sorry, I can't test at the moment | 01:44 |
|---|---|---|
| SamB_MacG5 | oh well :-( | 01:44 |
| jelmer | SamB_MacG5: libsvn-dev conflicts with heimdal so I can't build subvertpy | 01:44 |
| * SamB_MacG5 installs a thing | 01:46 | |
| jelmer | SamB_MacG5: ask me again next week when I don't need this Kerberos stuff as badly :) | 01:46 |
| SamB_MacG5 | this is NT's fault, isn't it? | 01:47 |
| jelmer | it's libpq-dev's fault for depending on krb5-dev | 01:48 |
| * SamB_MacG5 doesn't get why libapr depends on so much stuff either ... | 01:49 | |
| * SamB_MacG5 *poof* | 01:50 | |
| === mark06-away is now known as mark06 | ||
| mark06 | anyone knows which bug is the one mentioned above about adding email change to bzr-rewrite? I have searched for email and mail but can't find any http://bit.ly/PTiVqw | 02:16 |
| === mark06 is now known as mark06-away | ||
| === mark06-away is now known as mark06 | ||
| === mark06 is now known as mark06-away | ||
| === mark06-away is now known as mark06 | ||
| === mark06 is now known as mark06-away | ||
| === mark06-away is now known as mark06 | ||
| mark06 | wouldn't sed work over .bzr for replacing committer field if we ever get a way to uncompress the relevant files? | 03:25 |
| bob2 | not really | 03:27 |
| lifeless | mark06: in principle yes, but for referential integrity you need to change the revids too | 03:31 |
| mark06 | referential integrity like in relational databases? | 03:33 |
| mark06 | or are revids some sort of hash out of commit data? | 03:43 |
| lifeless | they are guids | 03:45 |
| mgz | morning! | 08:04 |
| === jam1 is now known as jam | ||
| === mmrazik is now known as mmrazik|lunch | ||
| === mmrazik|lunch is now known as mmrazik | ||
| trkv | Hi all. Whom can I ping to review my little merge-request? :) It has "pending" status for 2 months already. | 11:23 |
| mgz | here is good. | 11:25 |
| trkv | okay, it's https://code.launchpad.net/~torkvemada/bzr/commit_hooks/+merge/115348 | 11:25 |
| mgz | I think yours is the one I pass... right | 11:25 |
| mgz | I skipped that in my last big review-all-pending-branches sweep | 11:26 |
| mgz | the main reason being there's been a bunch of discussion about where to put commit hooks before that I wanted to dig up, and your proposal didn't include examples of how you intended to use these new ones to quickly compare about | 11:27 |
| mgz | but, as concrete things you can do to get this landing, adding some tests would be the main thing | 11:28 |
| trkv | mgz: I've already pointed in this very conference, what I added it for (it was 2 months ago, yes :) ) | 11:29 |
| trkv | just a little link: http://bazaar.launchpad.net/~torkvemada/+junk/bzr-cimage/view/head:/__init__.py | 11:29 |
| mgz | referencing that stuff in the merge proposal is the kind of thing that helps the reviewer | 11:29 |
| trkv | ok, I'll add the reference | 11:30 |
| trkv | could you point out the place in sources, where I should add the tests? | 11:30 |
| trkv | I'm not familiar with bzr sources | 11:31 |
| mgz | only seeing https://lists.ubuntu.com/archives/bazaar/2012q2/074812.html on cursory mailing list search for similar questions... | 11:32 |
| mgz | trkv: I'll try and find some earlier hook addition proposals for you for reference | 11:34 |
| mgz | trkv: see the following mps for some hints | 11:38 |
| mgz | <https://code.launchpad.net/~jelmer/bzr/transform-hooks/+merge/89007> | 11:38 |
| mgz | <https://code.launchpad.net/~jelmer/bzr/pre_post_command_hooks/+merge/87254> | 11:38 |
| trkv | ok, thanks, I'll look at it | 11:46 |
| tictacbum | Hello, I'm new to bzr, but I usually use git, there's an equivalent command to "git remote add ..." ? | 12:01 |
| fullermd | Well, since there's not an equivalent to git remote's... 8-} | 12:02 |
| fullermd | What larger task are you trying to accomplish? | 12:03 |
| tictacbum | but I can have different origins in bzr? | 12:05 |
| tictacbum | I want to pull from a public repositroy, make changes and commit them to a private one | 12:05 |
| tictacbum | then pull from public again... | 12:05 |
| fullermd | Mmph, I have a feeling terminological differences are going to bite us here... | 12:06 |
| tictacbum | :) | 12:06 |
| fullermd | But pull and push (and merge, which you probably want in the mix here) use different saved locations. | 12:06 |
| tictacbum | what do you mean with saved locations? | 12:09 |
| fullermd | Where 'bzr push' pushes to if you don't give it a URL on the command line. | 12:09 |
| fullermd | (ditto pull pulling from and merge merging from) | 12:09 |
| tictacbum | ah ok, it is the last one used no? | 12:10 |
| fullermd | First one used, actually. If there's no saved location, the first run saves what you set. | 12:10 |
| fullermd | Future explicit locations aren't saved unless you use --remember. | 12:11 |
| tictacbum | you know where does bzr save it? | 12:11 |
| fullermd | It's in the branch config. You can see the list in 'info'. | 12:11 |
| fullermd | And some other config-related command that vila will remind me of at some point. | 12:11 |
| vila | fullermd: bare 'bzr config' | 12:13 |
| fullermd | Not in public! | 12:13 |
| tictacbum | thanks, will try to understand better the concepts now | 12:13 |
| fullermd | tictacbum: The main concept to keep in mind is the branch-centric as opposed to repo-centric worldview. You'll confuse yourself into knots if you try thinking the wrong way (about either system) | 12:14 |
| fullermd | (and the somewhat different usages of 'repo' and so forth, but that's second tier) | 12:15 |
| tictacbum | fullermd: thanks :) | 12:15 |
| fullermd | tictacbum: http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/PiecesInBrief may be helpful. With a fair amount of existing DVCS experience, it may seem a little elementary, but it's still worth a careful read to catch differences in the worldview. | 12:17 |
| fullermd | Also the PiecesInLength sibling has bits that may help, especially some of the stuff at the end comparing terminology among different DVCSen. | 12:17 |
| fullermd | Which is probably not completely accurate, but the author's always a bit sloppy about stuff. It's mostly right, anyway. | 12:18 |
| mgz | the author is sloppy about kisses? | 12:19 |
| fullermd | Hey, some people are into that sort of thing! | 12:19 |
| fullermd | (obviously not MANY, or he wouldn't have time to write about version control, but still) | 12:19 |
| === Lasall42 is now known as Lasall | ||
| tictacbum | fullermd: great article, thanks to the author if you see | 12:40 |
| fullermd | Well, I try to avoid him, but it's probably unavoidable to run into him sooner or later. | 12:44 |
| tbf | after merge: how do i see what commit deleted a file? | 12:47 |
| tbf | need to know whom to kick | 12:47 |
| fullermd | Through the UI, you're pretty much limited to doing a log -v and /-ing through it. | 12:47 |
| tictacbum | back to my qüestion, can a project have more than one repository? | 13:16 |
| tictacbum | I tried to push and pull with repo after the command, and ended with a diverged branch | 13:18 |
| LeoNerd | Crazy request: bzr shelve; bzr unshelve-on-another-machine ssh://... | 13:51 |
| vila | LeoNerd: bzr commit; bzr push; bzr uncommit * 2 | 14:29 |
| LeoNerd | *twitch* | 14:29 |
| vila | LeoNerd: do you prefer 'scp .bzr/checkout/shelf/<n> another-machine/..../.bzr/checkout/shelf/<omg-hope-it-doesnt-exist> | 14:34 |
| LeoNerd | I'd prefer theabove :P | 14:34 |
| LeoNerd | But it doesn't exist.. so never mind | 14:34 |
| cmars232 | hi, is there a UI for bzr like gitk? | 14:35 |
| cmars232 | i want to see branch ancestry, see where merges have happened, where branches diverge, which one is missing a commit, etc | 14:35 |
| vila | cmars232: qlog from the qbzr plugin | 14:36 |
| cmars232 | vila: thx, checking it out | 14:36 |
| cmars232 | vila: qlog is exactly what I needed, thanks | 14:45 |
| vila | cmars232: make sure to not miss the ability to run it with multiple branches | 14:45 |
| matsubara | Hi there, I'm getting an error very similar to https://bugs.launchpad.net/bzr/+bug/819604 but that's fix released for awhile now and I'm using 2.5.1. I'm running tarmac and while it runs the pre-commit hook, bzr keeps the ssh connection open to the branch but when the tests are over and tarmac resumes, I get the broken pipe error. Any way to workaround the issue? | 16:26 |
| ubot5 | Ubuntu bug 819604 in Bazaar 2.4 "when an idle ssh transport is interrupted, bzrlib errors; should reconnect instead" [High,In progress] | 16:26 |
| mgz | matsubara: jam has some branches up aimed at fixing this, see the latest mp linked from that bug | 16:28 |
| matsubara | mgz, the one superseded? | 16:28 |
| matsubara | mgz, and is there any known workaround before this is released? | 16:34 |
| mgz | bug 1047325 is probably the other one you're interested in | 16:35 |
| ubot5 | Launchpad bug 1047325 in Bazaar "not properly interpreting EPIPE as connection reset" [Critical,Fix released] https://launchpad.net/bugs/1047325 | 16:35 |
| mgz | basically we only got really good testing of the reconnect stuff when launchpad's copy of bzr was upgraded, so some follow on fixes were needed | 16:36 |
| mgz | so, you can run a trunk bzr, or cherrypick that fix, or persude tarmac to discard the transport | 16:38 |
| mgz | I'm not sure which you'll find easiest | 16:38 |
| matsubara | hmm | 16:38 |
| matsubara | I guess running from trunk should do | 16:39 |
| matsubara | I'll try it and come back if it doesn't work | 16:39 |
| mgz | or lp:bzr/2.5 trunk | 16:39 |
| matsubara | thanks mgz ! | 16:39 |
| mgz | rather than dev | 16:39 |
| jelmer | hey mgz, matsubara | 16:39 |
| mgz | we'll try and get a release done when the maas stuff is less pressing | 16:39 |
| matsubara | hi jelmer | 16:40 |
| mgz | (which we want to bug you about doing some testing for tomorrow) | 16:40 |
| mgz | jelmer! how's the rain? | 16:40 |
| jelmer | mgz, absent! | 16:40 |
| matsubara | mgz, cool. let me know | 16:40 |
| mgz | alas. | 16:40 |
| jelmer | mgz: how's things here? | 16:41 |
| mgz | jelmer: bouncing along okay (and sunny) | 16:41 |
| mgz | found any samba bugs yet? | 16:42 |
| mgz | (I know, I know, shocking to even consider the possibility) | 16:43 |
| * SamB_MacG5 reconfigures LimeChat to stop highlighting SamB when it occurs as part of a word | 16:43 | |
| jelmer | plenty (-: | 16:43 |
| mgz | SamB: heh. | 16:45 |
| === matsubara is now known as matsubara-lunch | ||
| === matsubara-lunch is now known as matsubara | ||
| === yofel_ is now known as yofel | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!