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