/srv/irclogs.ubuntu.com/2008/01/06/#bzr.txt

jelmermtaylor: You mean if you abort a commit halfway through?00:11
mtaylormtaylor: no, I mean if you run bzr uncommit00:12
mtaylorcarap00:12
mtaylorjelmer: although I suppose aborting commit halfway through might be interesting too00:12
thatchdlee: are the branches related?00:34
jelmermtaylor: maybe in bzr_log.*~ in the cwd00:35
dleethatch: Yes, one formed the other at some point.00:40
dleeActually, 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:41
dleeBut I asked a generic question because I've wanted this sort of comparison in less peculiar circumstances. :)00:42
LeMechi! can somebody remember me where is this chat logged? I have discussed in the past here about Mac support01:19
LeMecand I would like to check if there was something more said on the topic01:19
LeMecwell, I've seached around and it looks like except the lucky win users and those using the Leopard distro there is no nice installer01:28
mtaylorLeMec: there's an IRC link on the inside.mysql.com homepage01:31
mtaylorLeMec: I believe it links to the place where the logs are01:31
mtaylorLeMec: nevermind... wrong IRC window01:31
mtaylor:)01:31
thatchLeMec: bzr.arbash-meinel.com/irc_log/bzr/ last I knew for logs02:00
LeMecthatch: it works thanks! wouldn't it be nice to have this link in the topic? so newbies are seeing it immediately?02:01
thatchLeMec: I think it's because they're unofficial?02:01
LeMecdoes it really count? I think unofficial is still better than nothing, isn't it?02:02
Verterokthatch, LeMac: I think http://irclogs.ubuntu.com/ is what you are looking for ;)03:06
=== thumper_laptop is now known as thumper
Qhestionis there a command to merge a local branch into a foreign branch (!)11:12
Qhestionforeign=remote11:12
Odd_BlokeQhestion: You could create a local copy of the remote branch, perorform the merge and then push it to the remote location.11:14
Odd_Bloke*perform11:14
Qhestiontoo complicated.11:14
Qhestionwell, i would just use a checkout but...11:14
Odd_BlokeQhestion: It's three commands, that's not especially complicated...11:15
Qhestionwhy three? why not one?!11:15
Qhestioni am working from 3 computers on the same thing. problem is, the path to the central repository changes.11:15
Qhestionso i would have to unbind/bind for nearly every commit.11:16
Qhestion(once a day. not a problem, but definitely not elegant)11:16
Odd_BlokeBecause merging into a remote repository where you can't fix conflicts is a Bad Idea.11:16
Odd_Blokes/repository/branch/11:16
Qhestionhmm sounds logical.11:16
ale666hi guys, i have just installed bzr. where is the revision downloaded?11:35
ale666and i have downloaded a branck of a project but i dont know where it is11:35
thumperale666: what did you type?11:54
thumperale666: sorry, 1am here and time to sleep11:55
ale666good night :) i figured it out. bzr is so nice!13:01
=== Verterok is now known as Verterok_
JordanCAhoy17:44
JordanCAre there windows-based bzr clients?17:45
JordanC(That have been released)17:45
PengWindows-based?17:46
JordanCYup17:48
mtaylorwell, there's bzr17:50
mtaylorwhich works on windows. :)17:51
JordanCGUI based? :P17:51
mtaylorI think someone is working on a tortoisebzr but I really don't know17:52
mtaylorthere's also a visual studio plugin... but again, I'm not sure of the status17:53
PengThere are multiple GUI plugins. QBzr, TortoiseBzr, bzr-gtk.17:59
JordanCQBzr is wierd18:03
JordanCBut it works :D18:03
* Peng shrugs.18:03
PengI don't use any of them.18:04
PengPartly because I'm happy with the command line, partly because I don't want to figure out how to install PyQt and whatnot. :P18:04
luksPeng, apt-get install python-qt4 :)18:04
luksJordanC, 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?18:06
mtaylorwhen I send a merge directive, it lists target_branch: and source_branch: in the human readable comments19:41
mtaylorif I open the revision bundle, are those stored within? Or do I need to parse them from the comments?19:41
* mtaylor guesses the second, but I thought I'd check19:42
beunomtaylor, bundles are generated with the commit's metadata, including the comment19:44
jelmermtaylor: The merge directive parser should be able to return them to you19:45
* dato would *guess* that the source branch is not in the bundle19:45
mtaylorjelmer: know where I'd look for the parser? is that in merge_directive.py ? :)19:46
jelmerthe source branch can be in the bundle because you should be able to send a merge directive without a patch19:46
mtaylormmm right19:46
jelmeryes19:47
mtaylorso I19:47
jelmerYou can call MergeDirective.from_lines()19:47
mtaylorha! I was just about to ask if that was the one. great! thanks19:47
mtaylorROCK19:50
mtaylorthat's fan-frickin-tastic19:50
jelmer:-)19:50
lifelessthumper: reminding you to mail me :)20:08
thumperlifeless: ta20:25
jelmer'morning lifeless20:26
jelmerlifeless: what sort of format changes do you plan to work on?20:27
lifelessjelmer: journalled inventories for now20:30
lifelesstheres a ton of stuff in the queue; but I'll probably take a break from bzr at some point ;)20:30
lifelessfile_ids are a big bugbear right in my target sights20:31
jelmerhmm, that's a word I had to look up :-)20:50
jelmerit would be awesome if file ids could be made more flexible or replaced by sometihng better20:51
lifelesspath tokens20:52
lifelessis my current plan20:52
lifelessbasically memoising the revision-path graph of a path object, allowing for splits and joins (allowing one requires the other for reversability)20:53
jelmerah, nice. I didn't know path tokens were that concrete already20:54
jelmerI really need to finish that shallow branches code as I have been promising for the last half a year20:55
PengWould this help with copies?20:55
jelmerPeng: yes20:55
lifelessPeng: by 'help' do you mean 'allow' ? :)20:56
Penglifeless: Heh, yes.20:56
PengThat sounds good.20:56
PengWhat are path tokens?20:56
lifelessPeng: yes, and also the reverse - combining two files that were separate into one.20:57
lifelessor directories for that matter.20:57
PengThat sounds nice.20:57
lifelesspath tokens are the code name I gave the concept20:57
PengHow's it work?20:57
lifelessI mailed the list a whlie back20:59
lifelesswe ended up talking about whether copies were desirable21:00
thumperlifeless: what is Branch format 6?21:03
thumperis that the tags one?21:03
PengYes.21:04
thumperPeng: ta21:04
thumperif I have a repository on one machine that is corrupt by missing a knit index file21:17
thumperhow can I get a client to push enough to fix it?21:18
lifelessyou can't21:18
lifelesswe only check references as we push, so to push everything you need to remove all the revisions21:19
thumperI was going to move the .bzr directory21:19
thumpera repush would fix yes?21:19
dleethumper: repush?21:40
thumperdlee: what I ment was push again21:41
dleelol ok...thought this might be another hidden command :)21:41
dlee... there being a remerge and all21:41
Peng'bzr help criss-cross' needs to be updated for LCA merge, doesn't it?21:56
j1mchi all - i was wondering if bzr revision control would even work on openoffice docs.  does anyone know?22:05
PengWell sure, it can store any sort of file.22:13
PengNo diffing or merging though.22:13
lifelessthere is a plugin to diff oo files22:15
PengNice.22:16
j1mclifeless and Peng ... thanks.  :)22:39
=== Verterok_ is now known as Verterok

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!