=== r0bby_ is now known as robbyoconnor [05:48] Yet another bad day trying to use Git. [05:48] it's not so complicated nowadays [05:49] bob2: I just discovered Git is incapable of tracking empty directories. #lame [05:49] yeah [05:49] it tracks files and symlinks only [06:04] AfC: at least it's capable of tracking more than one branch [06:07] all useful vc systems can do that though [06:07] bob2: and by branch I don't mean a repository [06:08] yes I know what a branch is [06:08] are you whinging about bzr-colo not existing or something? [06:09] bob2: I don't know what bzr-colo is, but I meant that bzr branch != git branch, more like git clone [06:10] ok! [06:10] anyway, bzr-colo or just use git [06:11] I'm looking at bzr-colo, and it looks like it's more like mercurial branches... still not the same [06:11] it's not [06:11] origin/master <- that I like [06:12] felipec: bzr-colo is nearly identical to git's model of branches [06:12] its not at all like mercurial [06:13] I think that's a complaint about branch identifiers not the branch model [06:13] lifeless: so, I can have master, devel, feature-a, origin/master, origin/next, bob/master, alice/feature-b, etc.? [06:14] felipec: yes, they sit in a subdirectory of off the root [06:14] and AIUI can have arbitrary names [06:15] lifeless: it's not about the name, it's about tracking a remote repository [06:17] it looks like there's support for a single remote repository, or workspace... I guess that's better than nothing [06:17] felipec: each branch tracks a remote branch [06:17] felipec: and there is a (not optimised) plugin to track entire repos [06:18] gluing the two together should be fairly easy, if you want to do that [06:21] all right, my git-remote-bzr is looking good :) http://pastie.org/5179942 [08:19] Yet another bad day trying to use Git. [08:20] I just discovered `git status` writes a file somewhere [08:21] Unreal [08:22] are you running it over fuse [11:29] bob2: no. It's .git/index.lock that gets {..., CLOSE_WRITE, CLOSE}. === yofel_ is now known as yofel [16:55] hey guys [16:55] if i made a commit and i would like to change the title of the commit...how do i do that? [17:04] Wiz_KeeD: bzr uncommit && bzr commit [17:07] aww i have to uncommit :( [17:07] i have to revert to that revission [17:07] uncommig [17:07] commit [17:07] then head back [17:24] Wiz_KeeD: yep - you can't really edit existing revisions, just create new ones [17:25] heh [17:25] thanks man [17:25] i'll be more careful then [17:28] It would be quite nice to have a 'bzr commit --amend' that implicitly based its parent revision on the parent-of-the-parent and preloaded the old commit message in the editor [17:30] indeed - there is a bug report open about that I think [18:21] okay, what the heck ... I have to deal with stale locks on *launchpad* now? [18:48] SamB_MacG5: only if connections actually got interrupted, etc? [20:58] jelmer: I don't know how it came to exist, really ... [20:58] but it was like a hundred days old [20:59] * SamB_MacG5 doesn't check his cron mail very often ... [22:41] * SamB_MacG5 thinks the SVN protocols ought to add a FAST-EXPORT type of command ... [22:43] If we just replace all SVN usage with some DVCS or other, we can bypass that whole problem 8-} [22:44] yeah, but while people are still using various DVCSes with SVN repositories ... [23:03] * SamB_MacG5 discovers debianlp:; doesn't remember seeing that in the bzr docs ... [23:47] jelmer: I was able to import/export to/from bzr without bzr-fastimport: http://pastie.org/5186077 [23:50] still missing a few features, but not bad for a couple days of work :)