=== thumper-afk is now known as thumper | ||
=== marcoceppi is now known as marcoceppi-mobil | ||
=== marcoceppi-mobil is now known as marcoceppi | ||
=== marcoceppi is now known as marco-traveling | ||
mgrandi | hello, i'm starting to use bzr's colocated branches for stuff at work, but is there a way to make it so it does not delete unversioned files when switching branches? | 20:07 |
---|---|---|
jelmer | mgrandi: do you mean bzr-colo or the builtin support for colocated branches? | 20:29 |
mgrandi | i think its the built in support | 20:29 |
mgrandi | i dont remember installing any plugins | 20:29 |
mgrandi | and its using the UI in bzr explorer | 20:29 |
jelmer | mgrandi: how do you interact with it on the command-line? | 20:30 |
mgrandi | i haven't interacted with the branches at all in the command line, although the branches are stored in .bzr/branches/trunk | 20:31 |
mgrandi | 'colo' plugin is installed however.. | 20:32 |
jelmer | mgrandi: yeah, that's the colo plugin | 20:35 |
mgrandi | does the latest version of bzr have the full colocated support without the colo plugin? | 20:36 |
jelmer | mgrandi: no, the colocated support in core is incomplete | 20:43 |
LeoNerd | jelmer: Ah, hi :) | 20:44 |
jelmer | I think the bzr-colo plugin is more mature at this point | 20:44 |
jelmer | hey LeoNerd :) | 20:44 |
mgrandi | ah =( | 20:44 |
mgrandi | so any idea on how it to preserve unversioned files? i thought that was the point of the colocated idea anyway | 20:44 |
LeoNerd | jelmer: LTNS.. While you're here - have you seen the bug in the bzr-git plugin? The one that reports something about not being able to find a graph-walker? (I forget quite the details, I can find a link if you like) | 20:44 |
jelmer | LeoNerd: yeah, that's related to Dulwich API changes for which bzr-git hasn't been updated | 20:44 |
jelmer | downgrading dulwich should work around it | 20:46 |
LeoNerd | jelmer: Ah OK.. Is that something someone is looking into? It's sortof biting me at the moment.. Fortunately it seems the code dies late enough that the actual pushing to github has happened, so it may just be cosmetic | 20:46 |
LeoNerd | Ah Isee | 20:46 |
* mgrandi curses jelmer slightly for removing tags from python-fastimport repo >.> | 22:08 | |
jelmer | mgrandi: I don't recall removing them | 22:22 |
mgrandi | i'm trying to run the bzr-windows-installers script so i can finally get a bzr 2.6 version out there, and it complained that there is no 'fastimport-0.9.0' tag in the python-fastimport repo on bzr, and there isn't =P | 22:22 |
mgrandi | (when i checked it out to check at least) | 22:23 |
jelmer | mgrandi: I'm pretty sure I haven't removed them, haven't touched the bzr repo | 22:23 |
mgrandi | the last (and only) tag in python-fastimport is 'fastimport-0.9.3' on your commit on march 1st | 22:24 |
mgrandi | wonder how they got removed then... | 22:24 |
mgrandi | jelmer: do you know what 'make chm-sphinx' is? i cant find that and it doesn't seem to be a python package or anything | 22:35 |
jelmer | mgrandi: the main python-fastimport repository is on github | 22:35 |
jelmer | mgrandi: I'm no longer using the bzr branch | 22:35 |
jelmer | mgrandi: chm is a windows help file thingy | 22:35 |
mgrandi | ah, well the script downloads it from launchpad | 22:35 |
mgrandi | yeah, but the build windows installers script is calling 'make chm-sphinx' and i dunno what that is haha | 22:36 |
jelmer | mgrandi: yeah, chm would be the windows help file that you can open and view with the regular windows help viewer | 22:36 |
jelmer | mgrandi: so it makes sense it's building that | 22:36 |
jelmer | mgrandi: Sounds like the script needs to be updated :) | 22:36 |
mgrandi | yeah im working on it =P | 22:51 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!