[00:02] mgz, http://msdn.microsoft.com/en-us/library/aa363866%28v=vs.85%29.aspx [00:02] mgz, also, ctypes [00:02] also need to be running as an administrator [00:03] which is just what stopped happening by default in the release that api was made available. [00:03] in Windows 7, users have the "Create symbolic link" permission by default [00:03] but meh [00:03] not worth it [00:03] it would help if you guys just wouldn't *fail* [00:04] I agree. [00:05] what's your source on the symlink cap being for everyone under 7? [00:05] I thought I'd read the opposite. [00:06] personal experience [00:06] I don't have the permission, and mklink works for me [00:12] How can i ignore mode changes? I'm working on a project locally (on my Ubuntu machine) and on a Windows machine accessed via CIFS and I don't want bzr diff or my commit history to be cluttered with mode changes. [00:13] good question. [00:15] Jordan_U: ask on the mailing list if no one pops up here with an answer. === Merwin_ is now known as Merwin [04:10] I have a commit I'd like to make to a repository I don't have write access to. How can my commit be sent as an email to the project maintainer? [04:17] How can I generate a diff for my local working copy when it contains binary files that I added? Right now the binary data isn't generated in bzr diff output. [04:25] KombuchaKip, bzr send [04:25] cody-somerville: I tried. I get a "ERROR: No submit branch known or specified" [04:25] KombuchaKip, 'bzr help send' to see which arguments it expects and how to use it [04:26] cody-somerville: I used "bzr send -o ~/Desktop/Kip.diff" which is what the docs say. [04:27] You need to pass as the second argument the branch you wish to submit your changes to [04:27] cody-somerville: How do I find that out? [04:29] KombuchaKip, Not sure I understand your question. [04:29] cody-somerville: How do I know what the second argument is? I checked out my code from a URL at bzr://blah [04:30] KombuchaKip, thats the second argument [04:30] cody-somerville: Right. But do I have to commit my changes locally first? [04:31] cody-somerville: I was reluctant to do that in case the commit isn't accepted upstream or needs changing. [04:31] yes, you need to commit locally [04:32] cody-somerville: But what happens if the commit isn't accepted upstream? Doesn't that cause headaches at my end because now the repos are not in sync? [04:32] KombuchaKip, You'd merge in any changes from them, make the changes they've requested of you, and then resubmit. [04:32] cody-somerville: Is there not simply a way I can generate a current diff, including the binary files as well? [04:34] KombuchaKip, You could commit, then push your branch to somewhere they can access, and then ask them to merge your branch in [04:34] cody-somerville: I think I'd prefer to just generate a diff, like I am used to with svn. How do I get bzr diff to generate binary diffs also? [04:38] KombuchaKip, You can't do that with svn. However, you can install bsdiff which is a program for generating and applying a patch between two binary files and tell bzr to use that via the --using argument to bzr diff. [04:39] cody-somerville: That's possible, but convoluted. I guess they call it bazaar for a reason. [04:39] Just sharing your branch with them is much easier. [04:40] KombuchaKip, It has nothing to do with bzr - patches aren't optimal for representing changes to binary files since binary files aren't human readable and patches are intended to be. [04:41] cody-somerville: Not quite. base64 is perfectly valid data for in a patch. Sometimes its necessary for non-plain text files that changed. === m4v is now known as mkv === mkv is now known as m4v === m4v is now known as mkv === psynaptic|away is now known as psynaptic === psynaptic is now known as psynaptic|away === deryck is now known as deryck[lunch] [16:40] good evening dear #bzr [16:40] Evening already?! I've barely had lunch :( [16:41] my evening is your lunch :-D [16:41] * bialix waves at fullermd [16:59] * mgz waves at bialix [16:59] hey Martin! [17:02] is there a way I can get 'git add' like semantics? [17:02] i made changes to a CSS file that I don't want to commit [17:07] magcius: bzr shelve allows you git stash your changes; bzr view allows you to specify subset of the tree you work on [17:08] bialix, bzr shelve doesn't allow me to pick out specific parts. [17:08] It says "yes or no", and I want half of it. [17:09] setup editor and then you'll be able to do so [17:09] just $EDITOR? [17:09] in bazaar.conf add to DEFAULT section: [17:10] change_editor = vimdiff -fo @new_path @old_path [17:10] or adjust the command line for your favorite editor [17:10] magcius: ^ [17:12] emacsclient -e '(diff "@old_path" "@new_path")' [17:12] yay [17:13] in the shelve prompt press 'e' now [17:13] why doesn't ^C work? [17:13] now, when I press "y", I'm telling it to stash it? [17:14] put it away for later? === deryck[lunch] is now known as deryck [17:17] yep [17:17] and how can I get it back? [17:19] magcius: bzr unshelve [17:20] ok, thanks! [17:20] :-) === beuno is now known as beuno-lunch [18:25] I've 2 branch, 'svn' is a bzr checkout of svn branch, 'bzr' is branched from 'svn' by `bzr branch'. Now 'svn' switched to a new branch, And I got lots of conflict when I try to merge 'bzr' to 'svn'. [18:25] I guess that's because the new svn branch is created later than those changes in 'bzr' [18:25] Is there nice way to handle this? === beuno-lunch is now known as beuno