[00:11] mtaylor: You mean if you abort a commit halfway through? [00:12] mtaylor: no, I mean if you run bzr uncommit [00:12] carap [00:12] jelmer: although I suppose aborting commit halfway through might be interesting too [00:34] dlee: are the branches related? [00:35] mtaylor: maybe in bzr_log.*~ in the cwd [00:40] thatch: Yes, one formed the other at some point. [00:41] Actually, this particular situation came from a cvsps-import: I think the "dgl" branch was a CVS vendor import, and "head" was used from then on. But dgl contains 48 revisions in bzr, and I want to see if anything diverged, because I actually don't *know* that "dgl" was an import branch. [00:42] But I asked a generic question because I've wanted this sort of comparison in less peculiar circumstances. :) [01:19] hi! can somebody remember me where is this chat logged? I have discussed in the past here about Mac support [01:19] and I would like to check if there was something more said on the topic [01:28] well, I've seached around and it looks like except the lucky win users and those using the Leopard distro there is no nice installer [01:31] LeMec: there's an IRC link on the inside.mysql.com homepage [01:31] LeMec: I believe it links to the place where the logs are [01:31] LeMec: nevermind... wrong IRC window [01:31] :) [02:00] LeMec: bzr.arbash-meinel.com/irc_log/bzr/ last I knew for logs [02:01] thatch: it works thanks! wouldn't it be nice to have this link in the topic? so newbies are seeing it immediately? [02:01] LeMec: I think it's because they're unofficial? [02:02] does it really count? I think unofficial is still better than nothing, isn't it? [03:06] thatch, LeMac: I think http://irclogs.ubuntu.com/ is what you are looking for ;) === thumper_laptop is now known as thumper [11:12] is there a command to merge a local branch into a foreign branch (!) [11:12] foreign=remote [11:14] Qhestion: You could create a local copy of the remote branch, perorform the merge and then push it to the remote location. [11:14] *perform [11:14] too complicated. [11:14] well, i would just use a checkout but... [11:15] Qhestion: It's three commands, that's not especially complicated... [11:15] why three? why not one?! [11:15] i am working from 3 computers on the same thing. problem is, the path to the central repository changes. [11:16] so i would have to unbind/bind for nearly every commit. [11:16] (once a day. not a problem, but definitely not elegant) [11:16] Because merging into a remote repository where you can't fix conflicts is a Bad Idea. [11:16] s/repository/branch/ [11:16] hmm sounds logical. [11:35] hi guys, i have just installed bzr. where is the revision downloaded? [11:35] and i have downloaded a branck of a project but i dont know where it is [11:54] ale666: what did you type? [11:55] ale666: sorry, 1am here and time to sleep [13:01] good night :) i figured it out. bzr is so nice! === Verterok is now known as Verterok_ [17:44] Ahoy [17:45] Are there windows-based bzr clients? [17:45] (That have been released) [17:46] Windows-based? [17:48] Yup [17:50] well, there's bzr [17:51] which works on windows. :) [17:51] GUI based? :P [17:52] I think someone is working on a tortoisebzr but I really don't know [17:53] there's also a visual studio plugin... but again, I'm not sure of the status [17:59] There are multiple GUI plugins. QBzr, TortoiseBzr, bzr-gtk. [18:03] QBzr is wierd [18:03] But it works :D [18:03] * Peng shrugs. [18:04] I don't use any of them. [18:04] Partly because I'm happy with the command line, partly because I don't want to figure out how to install PyQt and whatnot. :P [18:04] Peng, apt-get install python-qt4 :) [18:06] JordanC, the current qbzr is not intented to be a "bzr gui", just a tool to help with tasks where the command line is not enough. is that the weird part, or is it something else? [19:41] when I send a merge directive, it lists target_branch: and source_branch: in the human readable comments [19:41] if I open the revision bundle, are those stored within? Or do I need to parse them from the comments? [19:42] * mtaylor guesses the second, but I thought I'd check [19:44] mtaylor, bundles are generated with the commit's metadata, including the comment [19:45] mtaylor: The merge directive parser should be able to return them to you [19:45] * dato would *guess* that the source branch is not in the bundle [19:46] jelmer: know where I'd look for the parser? is that in merge_directive.py ? :) [19:46] the source branch can be in the bundle because you should be able to send a merge directive without a patch [19:46] mmm right [19:47] yes [19:47] so I [19:47] You can call MergeDirective.from_lines() [19:47] ha! I was just about to ask if that was the one. great! thanks [19:50] ROCK [19:50] that's fan-frickin-tastic [19:50] :-) [20:08] thumper: reminding you to mail me :) [20:25] lifeless: ta [20:26] 'morning lifeless [20:27] lifeless: what sort of format changes do you plan to work on? [20:30] jelmer: journalled inventories for now [20:30] theres a ton of stuff in the queue; but I'll probably take a break from bzr at some point ;) [20:31] file_ids are a big bugbear right in my target sights [20:50] hmm, that's a word I had to look up :-) [20:51] it would be awesome if file ids could be made more flexible or replaced by sometihng better [20:52] path tokens [20:52] is my current plan [20:53] basically memoising the revision-path graph of a path object, allowing for splits and joins (allowing one requires the other for reversability) [20:54] ah, nice. I didn't know path tokens were that concrete already [20:55] I really need to finish that shallow branches code as I have been promising for the last half a year [20:55] Would this help with copies? [20:55] Peng: yes [20:56] Peng: by 'help' do you mean 'allow' ? :) [20:56] lifeless: Heh, yes. [20:56] That sounds good. [20:56] What are path tokens? [20:57] Peng: yes, and also the reverse - combining two files that were separate into one. [20:57] or directories for that matter. [20:57] That sounds nice. [20:57] path tokens are the code name I gave the concept [20:57] How's it work? [20:59] I mailed the list a whlie back [21:00] we ended up talking about whether copies were desirable [21:03] lifeless: what is Branch format 6? [21:03] is that the tags one? [21:04] Yes. [21:04] Peng: ta [21:17] if I have a repository on one machine that is corrupt by missing a knit index file [21:18] how can I get a client to push enough to fix it? [21:18] you can't [21:19] we only check references as we push, so to push everything you need to remove all the revisions [21:19] I was going to move the .bzr directory [21:19] a repush would fix yes? [21:40] thumper: repush? [21:41] dlee: what I ment was push again [21:41] lol ok...thought this might be another hidden command :) [21:41] ... there being a remerge and all [21:56] 'bzr help criss-cross' needs to be updated for LCA merge, doesn't it? [22:05] hi all - i was wondering if bzr revision control would even work on openoffice docs. does anyone know? [22:13] Well sure, it can store any sort of file. [22:13] No diffing or merging though. [22:15] there is a plugin to diff oo files [22:16] Nice. [22:39] lifeless and Peng ... thanks. :) === Verterok_ is now known as Verterok