| lduros | Hi there, what's the proper way to resolve a content conflict when you have a directory and you have a directory from the tree you're merging but you really don't want that directory to be there? I tried bzr rm [directory], but then when I do bzr resolve, it doesn't seem to list it as resolved | 01:33 |
|---|---|---|
| lduros | I guess after rm -rf the directory, if I do bzr resolve --all. it takes care of it | 01:38 |
| === echo-are` is now known as echo-area | ||
| didrocks | hey | 09:42 |
| didrocks | I have a branch which is in split mode (well, I guess seeing my change to .bzr-builddeb/default.conf) | 09:43 |
| didrocks | but when I bzr bd, I see: Building package in native mode | 09:43 |
| === Enlik|meh is now known as Enlik | ||
| didrocks | and then: | 09:43 |
| didrocks | This package has a Debian revision number but there does not seem to be | 09:43 |
| didrocks | an appropriate original tar file or .orig directory in the parent directory; | 09:43 |
| didrocks | … | 09:43 |
| didrocks | any idea what can happen? Forcing split mode with --split in bzr bd, it works fine | 09:43 |
| === mmrazik is now known as mmrazik|afk | ||
| === mmrazik is now known as mmrazik|lunch | ||
| === mmrazik|lunch is now known as mmrazik | ||
| === mmrazik is now known as mmrazik|afk | ||
| jelmer | didrocks: debian/source/format perhaps? | 12:40 |
| didrocks | jelmer: it's set to 3.0 (quilt), does it impact it? it's run before bzr split it? | 13:03 |
| didrocks | oh | 13:03 |
| didrocks | yeah, it's native, not split | 13:03 |
| didrocks | thanks jelmer :) | 13:04 |
| === mmrazik is now known as mmrazik|otp | ||
| === mmrazik|otp is now known as mmrazik | ||
| === beuno is now known as beuno-lunch | ||
| === beuno-lunch is now known as beuno | ||
| === deryck is now known as deryck[lunch] | ||
| === deryck[lunch] is now known as deryck | ||
| === yofel_ is now known as yofel | ||
| === mrs_poolie is now known as cinerama | ||
| === cinerama is now known as mrs_poolie | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!