| bob2 | sounds like perms on the ftp server are busted | 00:11 |
|---|---|---|
| Peng | Or it's just FTP bustedness. | 00:12 |
| lifeless | smells like that windows cluster-fs issue someone was running into a couple years back | 00:16 |
| lifeless | where the cluster sync locked the file against renames or something-like-that | 00:17 |
| Kamping_Kaiser | no jelmer? | 05:56 |
| Kamping_Kaiser | sems not. | 05:56 |
| rigel | hi, i'm trying to work with the bzreclipse plugin, and i can't figure out how to import a project directly from bzr with it, if indeed that is possible. | 13:04 |
| rigel | just because my experience is that it's kind of a PITA to get source from a VCS, and then import that | 13:05 |
| === JoeMaverickSett is now known as MavJS | ||
| * maxb wonders why 'bzr pull' would be write-locking the source branch | 18:24 | |
| maxb | Oh, not the source branch per-se, but the bound branch | 18:26 |
| === maxb changed the topic of #bzr to: Bazaar version control <http://bazaar.canonical.com> | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: Riddell and jam | ||
| === yofel_ is now known as yofel | ||
| jonathanj | hey | 22:03 |
| jonathanj | i seem to have this happen to me often enough that i'm wondering if there is something in bzr to help me | 22:04 |
| jonathanj | i start making changes in a branch and then realise later that these should probably be in another branch and i'd like to apply the diff on branch A to branch B | 22:04 |
| jonathanj | currently i just do bzr diff > ~/tmp && bzr revert && cd .../other-branch && patch -p0 < ~/tmp && rm ~/tmp | 22:05 |
| lifeless | bzr merge --uncommitted | 22:06 |
| jonathanj | lifeless: but then don't i have to fiddle with revisions to only merge the thing i want and not all the other changes? | 22:06 |
| jonathanj | oh i see, --uncommitted is *only* uncommitted | 22:07 |
| lifeless | right | 22:07 |
| jonathanj | great, thanks! | 22:07 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!