| === SamB__ is now known as SamB | ||
| === 17WAB9WQY is now known as jam | ||
| quicksilver | is there any way to add a file in two branches (same file) so they won't conflict when merged? | 15:44 |
|---|---|---|
| quicksilver | --file-ids-from | 15:45 |
| quicksilver | documentation++ | 15:47 |
| jelmer | quicksilver: they'll probably still conflict, but not in the annoying way where ever subsequent merge will cause file id conflicts. | 15:47 |
| * quicksilver nods | 15:51 | |
| quicksilver | well I normally end up deleting one copy | 15:52 |
| quicksilver | so there is only one left | 15:52 |
| quicksilver | jelmer: seems it doesn't conflict if you merge immediately | 15:54 |
| quicksilver | which I have now done. | 15:54 |
| quicksilver | merge "the other way" if you follow | 15:54 |
| ggherdov | hi all. Is bzr still under active development? | 22:11 |
| jelmer | ggherdov: 2.6.0 was released a couple of days ago | 23:17 |
| Luke-Jr | jelmer: do you plan to fix bzr-svn? | 23:40 |
| jelmer | Luke-Jr: fix what specifically? | 23:40 |
| jelmer | linking against libsvn > 1.7 ? | 23:40 |
| Luke-Jr | yes | 23:41 |
| Luke-Jr | pretty much every distro is removing it completely because it no longer works with current software | 23:41 |
| jelmer | I might - most of the work is actually in subvertpy, which I still maintain | 23:43 |
| Luke-Jr | hrm, seems my bzr still breaks even after I remove bzr-svn :| | 23:45 |
| jelmer | Luke-Jr: with what error? | 23:45 |
| Luke-Jr | ImportError: cannot import name CommittedQueue | 23:45 |
| Luke-Jr | http://codepad.org/He4KkusS | 23:45 |
| jelmer | Luke-Jr: looks like you still have bzr-svn installed in that case. does "bzr plugins" still list it? | 23:45 |
| Luke-Jr | yes | 23:46 |
| jelmer | sounds like it's still installed then. "bzr plugins -v" will tell you where | 23:46 |
| Luke-Jr | looks like the .pyos remain | 23:46 |
| Luke-Jr | oh well, bzr-svn was basically all I used bzr for anymore anyway :x | 23:47 |
| jelmer | I'm not planning to do more work on bzr-svn itself | 23:52 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!