| wolter | how do I set the source branch of a directory? | 01:14 |
|---|---|---|
| wolter | I have been trying to with bzr switch, bzr pull and I still dont get the current revision | 01:17 |
| wolter | I get some merge tips when I run bzr status | 01:17 |
| wolter | When I pull it tells me that the branches have diverged and thus I have to merge, I merge and try again but nothing changes | 01:18 |
| bob2 | bpaste.net output of 'bzr status' | 01:33 |
| wolter | bob2, http://bpaste.net/show/2XVKrJcfFLSFgeDA4lxp/ | 02:53 |
| bob2 | you need to either commit the merge or abort it | 02:56 |
| wolter | ok, but if I commit wouldn't I keep on having divergent branches? | 03:00 |
| wolter | bob2, ^ | 03:04 |
| bob2 | ? | 03:36 |
| === yofel_ is now known as yofel | ||
| jam1 | morning all | 07:01 |
| === jam1 is now known as jam | ||
| mgz | morning! | 08:02 |
| jam | morning mgz | 08:08 |
| vila | morning .gzS | 08:52 |
| mgz | S? | 08:53 |
| jelmer | mgz: you and your army ? :) | 08:54 |
| vila | mgz and wgz :) | 09:03 |
| vila | The 'S' was for non-native regexps speakers ;) | 09:03 |
| caravel | hello all o/ | 10:56 |
| jelmer | hi caravel | 10:57 |
| caravel | I've introduced bzr for a while in one of my projects, and got windoz users to use it w/ Tortoise, Here I use Fedora 16 KDE, cli works great :) | 10:59 |
| caravel | I've acivated Bazaar KDE service as avail under 4.8.3, but it doesn't seem to work : | 11:00 |
| caravel | all I get, when I enter one of the repo folders in Dolphin, is a statusbar message : Update of version information failed." | 11:01 |
| caravel | nb, this is a local shared repo with bzr+ssh branched trees inside, and ssh is configured fine w/keys (i.e. no pwd needed while using the cli) | 11:02 |
| caravel | (I also use Bazaar explorer and QBazaar, these worked fine the few times I tried them) | 11:04 |
| * caravel wouldn't mind getting the same level of visual comfort as in the past with tortoise/cvs/svn under windoz, that's pretty efficient "when it works", even thou it costs a few resources :) | 11:08 | |
| mgz | caravel: is there anything with that message in your .bzr.log file? `bzr version` will tell you where to find it | 11:13 |
| vila | jelmer: did you notice bug #1001270 | 11:45 |
| ubot5 | Launchpad bug 1001270 in bzr email commit hook "recent refactoring removed send_text_and_attachment_email" [Critical,Confirmed] https://launchpad.net/bugs/1001270 | 11:45 |
| jelmer | vila: ah, didn't see that | 11:47 |
| jelmer | I guess there's no tests for that bit of the code :( | 11:48 |
| vila | there was :) | 11:49 |
| vila | but not at blacbox level | 11:49 |
| vila | k | 11:49 |
| jelmer | vila: I don't see anything in bzr-email that tests it? | 11:49 |
| vila | so yeah, not *enough* tests | 11:49 |
| vila | tests/test_smpt_connection.py | 11:50 |
| vila | tp | 11:50 |
| vila | the one you removed ;) | 11:50 |
| jelmer | vila: I've merged Bob's fix | 11:53 |
| vila | I had no idea, your the only committer there | 11:54 |
| vila | (revno 56) | 11:55 |
| vila | jelmer: ha, completely misread your remark about Bob, where did you merge the fix ? | 12:20 |
| vila | jelmer: lp:bzr-email is still at revno57, no fix there | 12:22 |
| jelmer | vila: sorry, pushed now | 12:31 |
| vila | jelmer: works \o/ | 12:36 |
| caravel | mgz: thanks for your answer (just seen it) well, bzr version tells me the log file is /home/myuser/.bzr.log however there is no such file here (?) Using bzr-2.4.2-1.fc16.x86_64 (latest stable in fedora @updates repo) | 12:50 |
| * caravel found it .... kate won't open it for some reason, nano does | 12:52 | |
| * caravel hmm, can open it with kate from cli or using xdg-open, it's just the kate file selector that refuses to open it (?) | 12:55 | |
| caravel | mgz: ok, so when entering the folder which holds the shared repo, the log complains that there is no checkout subdir - which makes sense. I guess it shouldn't, since it's a shared repo ? http://www.fpaste.org/W1kS/ | 13:02 |
| caravel | shouldn't *search for a working tree, I mean | 13:02 |
| caravel | besides, entering any of the subfolders in dolphin - each holding a branched working tree - does not complain any more. I will check the log next time (thanks) | 13:05 |
| caravel | however it spits 6 identical "opening working tree" stanzas in the log, that sounds much ? | 13:06 |
| caravel | sorry, they're not identical, u'root' u'ignored' u'status' then again u'root' u'ignored' u'status' | 13:08 |
| mgz | caravel: glad that's working now, extra stuff in the log is likely just the dolphin extension doing a bit more work than it needs to | 13:13 |
| caravel | mgz: indeed. Well, it's nice to see the folder colour changing to green :) | 13:13 |
| caravel | (folder name) | 13:13 |
| caravel | mgz: I suppose the behavior on the shared repo is a bug, right ? | 13:14 |
| caravel | I'd have another question for today : is that an issue to use 2.4.2.1/Fedora and 2.5.0/Windoz clients simulatneously (from different hosts) to push commits to the same remote branches ? | 13:17 |
| mgz | caravel: no, there shouldn't be. | 13:18 |
| caravel | mgz: thanks. And how about using both clients to manipulate the same local shared repository, i.e. alternatively from a Fedora host and an XP guest (as running in a VM) ? | 13:18 |
| caravel | I mean, not performing actions at the same time, but one after each other | 13:19 |
| mgz | that's a little more suspect, mostly due to ntfs/nfs issues | 13:20 |
| mgz | depends how exactly you're sharing the filesystem basically | 13:20 |
| caravel | mgz: XP guest accessed the folders as network share, so that's vboxfs not ntfs | 13:20 |
| caravel | accesses* | 13:21 |
| caravel | well, I can't express myself today :) | 13:21 |
| caravel | I mean, not a net share, a vbox share -- xp sees it as a network share, but it is not really | 13:22 |
| caravel | mgz: as a matter of fact I did init and branch using 2.5.0/xp guest, then pulled using 2.4.2.1/fedora host, and that seem to work transparently :) just fearing some mess if going back and forth | 13:24 |
| mgz | provided access really is serialised, and you stick you the subset of filesystem features both xp and nix support, it should be fine | 13:25 |
| caravel | right | 13:25 |
| caravel | I just need to keep guiding windoz users i.e. screen caps and things sometimes, but wish to to be bound to windoz myself, and 2.5.0 isn't there yet in fedora repo | 13:26 |
| caravel | wish *not | 13:26 |
| caravel | ok, thanks mgz | 13:28 |
| caravel | thanks everyone for the nice progress cf. kde service client, and good day o/ | 13:28 |
| * caravel will come back with more log if error ever come back :) | 13:29 | |
| hrw | hi | 15:59 |
| hrw | can someone remind me easiest way to cherry-pick commits from one bzr branch to another? something like "git format-patch" + "git am" would be lovely as this also keeps commit message. Now I am doing "bzr diff -cREV" + "patch -p0" but have to commit after it and provide commit message | 16:00 |
| === deryck is now known as deryck[lunch] | ||
| jimis | hrw: I've used "bzr merge -r 122..123", you can combine it with -rbranch and get from any branch? | 17:16 |
| bj0 | what would cause bzr to not use '.bzrignore' | 17:23 |
| === deryck[lunch] is now known as deryck | ||
| jelmer | bj0: is it versioned? | 18:00 |
| bj0 | the .bzrignore file is versioned yes | 18:07 |
| bj0 | there are 'unknown' files in the directory, if i add them to .bzrignore, they are still listed as unknown. | 18:08 |
| jelmer | bj0: can you give an example? | 18:24 |
| bj0 | you mean like this? http://pastebin.com/Umbhi4CV | 18:26 |
| jelmer | hmm, that seems wrong indeed | 18:27 |
| jelmer | bj0: what version of bzr are you using? | 18:27 |
| bj0 | 2.5b6 | 18:28 |
| bj0 | it works for some of my bzr branches | 18:28 |
| bj0 | most of them actually | 18:28 |
| bj0 | not sure why this one doesn't work | 18:28 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!