| jelmer | vexo: sure, but you can merge a single directory from a branch | 00:02 |
|---|---|---|
| jelmer | (you'll get the full history from the branch but just the directory you specified) | 00:03 |
| vexo | Mmmm, I just tested it, and when merging just a subdirectory (bzr merge other/dir -r0..-1), you don't get the history | 00:09 |
| jelmer | vexo: hmm, I wonder if that is a recent change in behaviour | 00:12 |
| jelmer | vexo: the other alternative is to merge the full branch and then remove the files you're not interested in | 00:13 |
| vexo | Well, yes, that'd obviously always work ;) | 00:15 |
| vexo | That could potentially be a large amount of overhead, though, so not necessarily ideal if you really only wanted just the one folder | 00:18 |
| rozzin | Such concern about subdirectories. svn really broke people ;) | 01:12 |
| bob2 | heh | 01:13 |
| === SamB_ is now known as SamB | ||
| === thumper is now known as thumper-afk | ||
| === stub` is now known as stub | ||
| === wallyworld__ is now known as wallyworld | ||
| === jam1 is now known as jam | ||
| === thumper-afk is now known as thumper | ||
| ok259 | I'm using bzr-svn and when I try to bzr commit my changes to the SVN trunk, I get the following error "bzr: ERROR: This operation requires storing bzr-svn metadata in Subversion file properties. These file properties may cause spurious conflicts for other Subversion users during merges. To allow this, set `allow_metadata_in_file_properties = True` in your configuration and try again." I do not want any of my bzr metadata to be visible to other users of th | 13:59 |
| ok259 | e repository. Is there a way for me to still commit my changes? | 13:59 |
| ok259 | Ah, I'm so stupid. --lossy is what I need. My apologies. | 14:06 |
| janos | hi jelmer, you around? | 21:16 |
| janos | jelmer: I just wanted to say thanks for the tweet last week, I appreciate the support | 21:45 |
| jelmer | janos: no problem :-) | 21:56 |
| janos | jelmer, another thing, the publisher is looking for technical reviewers | 21:56 |
| janos | do you know anyone who might be interested? (yourself included!) | 21:57 |
| jelmer | janos: sure, I would be happy to do some reviewing - perhaps a chapter or two | 22:03 |
| jelmer | janos: some of the other core committers might also be good candidates | 22:03 |
| janos | jelmer, great! I'll look them up | 22:07 |
| === thumper is now known as thumper-afk | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!