=== khmarbaise_ is now known as khmarbaise
GungaDinif I've merged something (still haven't committed!!!)  and I'd like to reverse this operation and do a different merge, how can I do that?06:11
GungaDinbut hasn't the history been updated yet?06:12
bob2not until you commit06:12
RAOFbzr is all about not doing things you don't want to do. :)06:16
fullermdWhere's the "no-taxes" plugin then?06:18
=== Adys is now known as Adys_
=== Adys_ is now known as Adys
vilahi all !07:41
* fullermd waves at vila.07:42
masklinnhello, is there a way to edit history in bazaar in order to fix a previous (broken, but not yet published) commit? In mercurial I'd use mq, qimport everything down to the faulty commit, qpop and edit my broken commit (or merge patches, whatever), in git I'm sure I'd find a way, but in bazaar I haven't found any paths so far. Loom is billed as an equivalent to MQ, but looks very complex, apparently modifies the repository format (is it still possible 09:59
masklinnpush to the regular, old format? Or for loom-less people to get non-loomed revisions as it is with hg mq?) and I haven't found any instruction on importing "normal" bzr revisions into looms and exporting them back in bazaar.10:00
masklinnSo... is there anything I missed? How do you handle the case where you performed a broken commit and only realize it 5 commits later?10:02
bob2you can uncommit10:03
beunoor use bzr-rewrite10:03
bob2or you can branch from before the problem and manually commit new changes10:03
bob2or use bzr-rewrite10:03
bob2aka bzr rebase10:03
Pengmasklinn: Mostly we just commit a fix. :P10:04
masklinnI don't want to uncommit, first uncommit is broken on my mac, second that means I have to manually store 5 different log messages in some kind of text file so I can re-commit later10:04
masklinnbzr-rewrite sounds interesting10:04
bob2depends what broken means, too10:04
masklinnpeng, I'd do that if the revisions were already published, but the history is still fully local so it's a waste to have broken revisions in there when I'm still in a position to amend them without anybody knowing10:04
bob2if it's "bug in the code", just fix it like Peng said10:05
bob2if it's nuclear launch codes, then put more effort in10:05
KinnisonOr you put up with the fact that you got a broken commit; fix the issue on head, and move on, having learned to be more careful in future :-)10:05
vilamasklinn: if uncommit is broken on your mac (how so ?), please a file a bug10:05
masklinnvila: it locks up 9 times out of 10, no error message no nothing, and I have to C-c, break the lock, update and I lose all the changes in the tentatively uncommited commit10:05
vilamasklinn: no messages even in .bzr.log ?10:06
masklinnvila: I don't know, I'll have to check next time it happens10:06
masklinnvila: never really wondered about the logfile10:06
vilamasklinn: .bzr.log should still contain your old attemps, no need to wait :D10:06
masklinnvila: yeah but I tend to create and delete lots of clones, so I'm not sure I still have repositories where I did it. I tend to just avoid the operation these days10:07
vilamasklinn: ok, then keep in mind that many people use uncommit on mac (myself included) and nobody ever report problems there, so presumably something is special in your config10:09
masklinnvila: i'm sure that's the case, which is why I specified it was broken on *my* machine, not in general ;)10:09
vilamasklinn: if there is a bug, we want it to be fixed ;)10:10
masklinnyep, I'll check the log next time I forget myself and try an uncommit10:10
j^why does bzr use so much memory if i checkout an lp repository without account?10:11
j^i.e. bzr branch lp:bzr10:11
j^595m 421m 2280 D  1.0 42.1   3:27.54 bzr10:11
gerard_jam: did you see the latest changes to my branch?10:42
gerard_I'm happy with it now :) ;)10:42
masklinnvila, where's the bzr log supposed to be?10:45
masklinnoh, not in the repo root or .bzr?10:46
vilamasklinn: 'bzr version' should tell you10:46
vilagerard_: jam in in Chicago, he's sleeping :D10:46
fullermdYeah.  Nobody in this TZ would be awake at this hour; that would be crazy.10:47
vilaj^: which bzr version are you using ? bzr-2.1 has fix a few related bugs10:47
gerard_vila: ah, hehe10:48
vilayeah no *average* body :D10:48
vilaonly people like cops, fire workers and the like, plus of course the bad guys...10:48
viladid I miss some category ? :D10:49
fullermdWell, I'm not a cop, I'm not a fire worker, I...   umm....10:50
fullermdWell, no, I guess that's all the categories   :p10:50
masklinnvila, well there does't seem to be anything of note in the logs: http://pastebin.com/d7e2a0cf010:51
masklinnIs there a way to turn the log's verbosity to 11 or something? I don't see anything in the docs10:51
vilamasklinn: you meant C-c or you really did C-z ?10:52
masklinnI really did C-z, C-c didn't do anything, and neither did C-d10:53
masklinnThe above revision(s) will be removed.10:53
masklinnAre you sure [y/N]? y10:53
masklinn[1]+  Stopped                 bzr uncommit10:53
vilaC-z suspend the process and put it in the background, you leave bzr no chance to clean up anything10:53
masklinnwell to kill it I used a regular kill, not a kill -910:53
masklinnso theoretically it should have given bzr the ability to do something, right?10:54
vilaweird, what kind of setup are you using ? A bound branch ? The warning about the working tree out of date may be due to the break...10:55
vilamasklinn: well, yes10:55
masklinnyeah the warning is due to the break, that's not an issue (the second command is mainly to show that there was nothing after the uncommit)10:55
fullermdWell, if ^C (with at least a few seconds) didn't interrupt it, it's stuck in the kernel somewhere, so it would never get a chance anyway.10:55
masklinnit's a standalone10:55
vilamasklinn: what bzr version are you using ? (I'm pretty sure the recent ones always output that in the log)10:55
masklinnvila: it's a standalone tree10:55
masklinn2.0.4 from macports10:56
masklinnBazaar (bzr) 2.0.410:56
masklinn  Python interpreter: /opt/local/Library/Frameworks/Python.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/Python 2.6.410:56
masklinn  Python standard library: /opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.610:56
masklinn  Platform: Darwin-10.2.0-i386-64bit10:56
masklinn  bzrlib: /opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib10:56
ubottuFor posting multi-line texts into the channel, please use http://paste.ubuntu.com | To post !screenshots use http://tinyurl.com/imagebin | !pastebinit to paste directly from command line | Make sure you give us the URL for your paste - see also the channel topic.10:56
vilamasklinn: where is your repo ? Local ? http ? bzr+ssh ?10:57
vilamasklinn: mounted NFS ?10:57
masklinnlocal fs10:57
masklinnfreshly cloned from another local repo10:58
vilamasklinn: so you don't use shared repos ? (You should give it a try if you use many branches that share history)10:58
masklinnvila: I sometimes do, but I didn't on that project. And we have... issues with shared repos (the remote repositories are in a pretty old format, so things don't work out well when trying to push or push shared repos to lp)10:59
Peng...Huh? How would shared repos make a difference there?11:00
masklinnyou tell me11:00
masklinnbzr whines about incompatible repository formats11:01
masklinnand lp then tells me that the repo I just pushed is broken11:01
PengIt's notable that "bzr branch" uses the source branch's format by default, but the shared repo's format if you're in a shared repo (obviously), but it's not hard to keep that straight.11:01
vilaPeng: I didn't way they were related, just mentioning them11:01
Pengvila: Err, sorry. I was just replying to masklinn, not you.11:02
vilaPeng: no worries ;D11:02
vilamasklinn: I agree with Peng, most probably you ran into bzr forcing the default format to be 2a11:03
masklinnPeng: yes, and the shared repo is created using 2a by default, and by the time i realized that I was basically hosed. And I'm not even clear on which format I should be using locally to keep things straight, as the repo names on the CLI and the ones given by error messages are basically unrelated11:03
vilamasklinn: have a look at the upgrade guide: http://doc.bazaar.canonical.com/latest/en/upgrade-guide/index.html11:03
masklinn(I'm not even sure the remote repo's format is compatible with shared repositories)11:03
vilamasklinn: I'd be suprised if you use a format that doesn't support shared repos11:04
masklinnvila: might be possible at some point, but the project is pretty big, and e.g. ubuntu 8.04 doesn't ship with 2.0, so for now it's not upgraded11:04
PengIt would have to be horrifically old, or broken, to not support shared repos. Besides, what matters is the local format.11:04
vilamasklinn: ok, let's put that aside for now then11:04
fullermdI'd be well beyond surprised.  all-in-one formats are *OLD*.11:04
vilamasklinn: how big is your working tree ?11:05
masklinnvilla: the project/branch in question is https://code.launchpad.net/~openerp/openobject-addons/5.0 (warning: humongously huge)11:05
masklinnvila: .bzr is 93MB, total WC is 160MB11:05
vilamasklinn: how many files ?11:05
masklinnvila: I fear my bzr-fu and terminal-fu are too weak to know, how can I check?11:06
vilaI wonder if you may be missing some progress report and if bzr is actually taking longer than usual to finish the uncommit11:06
vilafind . | ec -l11:07
masklinnvila: I don't think so, in the past I let it run 30mn+, never saw any progress11:07
vilafind . | wc -l11:07
PengOr "bzr inventory | wc -l".11:07
vilawow, 30mn is indeed far too long11:07
masklinnvila: find . reports 5722, bzr inventory reports 568911:07
vilacan you pastebin the output of 'brz info -v' ?11:08
vilamasklinn: wow, 33 unknown files ? Or are there some *~n~ files ?11:08
masklinnvila, wouldn't those be the files in .bzr?11:08
vilamasklinn: oh sure11:09
PengWow, the remote branch is rich-root-pack, so you actually could use 2a locally, though converting between them takes a couple seconds.11:09
PengHowever, you can't *stack* between them, and that's probably what's freaking Launchpad out.11:09
vilabug 33 sounds a bit high, ha no, the repo is there11:09
ubottuLaunchpad bug 33 in malone "in bug list, the 'normal' severity label has a popup that says 'critical'" [Medium,Fix released] https://launchpad.net/bugs/3311:09
vilagrr *but* 3311:09
vilaubottu: your humour is thick11:11
masklinnvila: http://pastebin.com/d78ba219711:11
masklinnapparently something is a bit broken after the uncommit11:11
masklinnrunning a bzr check11:12
fullermdThat probably means the uncommit did its job on the branch, and failed trying to do stuff in the working tree.11:12
fullermdThat's consistent with stat bleating about needing 'update' too.11:12
* vila agrees with fullermd 11:12
masklinnfullermd: I did an update after that, so the working tree should be in sync11:13
vilaafter what ?11:13
fullermdAnd doing stuff in the WT does OS locks last I checked, which is also the most likely place for uncommit to lock itself up inside the kernel.11:13
masklinnafter it asked me to bzr update11:13
masklinnI bzr broke-lock and bzr updated11:13
vilayeah, so something was already broken there probably11:13
vilafullermd: OS locks are broken in OSX ? As much as in BSD ? :-D11:14
masklinnwell the original repo I cloned from (the one without/before bzr uncommit) seems ok11:14
PengSure, working tree nonsense won't break the branch or repo.11:15
PengWell, maybe, if you somehow commit something horribly wrong, but that's difficult.11:15
vilamasklinn: side-note: since you already use a rich-root-aware format, migrating to 2a is easier11:16
vilaPeng: like what ? If we can commit it we can uncommit it :D11:17
masklinneasier for me, but not easier for the project as a whole, and it doesn't solve lp freaking out everytime a bee flies near the window11:17
vilamasklinn: easier compared to people using a non rich-root-aware format11:18
PengIdeally, LP would be less dumb. I'm not sure whether it's supposed to be, too.11:18
PengYeah, the only issue you've got converting between rich-root-pack and 2a is stacking.11:18
masklinnPeng: ideally^2, lp would start by offering the same "clone" button github and bitbucket do11:18
fullermdAlso, a pony.11:18
masklinnand then I'd know beforehand that Stuff Works11:18
PengWell, and that pushing 2a up to LP is rude if not everyone using the project has a new enough version of bzr...11:18
masklinnyeah, i like ponies11:19
masklinnPeng: yep, though I think the stacked thing is creating enough pain right now that the "deciders" are looking at just migrating everything to 2a and telling users to install 2.x ppas11:19
vilamasklinn: can you pastebin the relevant portion of .bzr.log leading to the traceback about bzr: ERROR: bzrlib.errors.NoSuchRevision: BzrBranch6('file:///Users/masklinn/projects/tiny/addons/stable-security-fix-2575/') has no revision xmo@tinyerp.com-20100205202639-4l5e0z4gwyvof1b211:20
vilamasklinn: migrating everything to 2a and telling users to install 2.x ppas is a good idea, you'll get smaller repos, faster bzr and the ability to bzr push stacked branches on LP, which in turn will allow you to push roughly size(changes) for new branches11:21
masklinnvila: yeah, but that requires users to install ppas on "older" ubuntus (and get lost if they're using non-ubuntu distros which don't ship 2.x, I guess) which isn't very nice to them11:22
vilamasklinn: bzr-2.0 is being backported to older Ubuntu releases, this should happen RSN (tm)11:23
fullermdJust in time for 2.1 to be out, maybe  ;p11:24
masklinnvilla: This should be the part of the log leading to the error: http://pastebin.com/m2e6f66be11:24
masklinnfullermd: talking about 2.1, does it change the repo format *again*?11:24
jelmermasklinn: only major versions (1.0, 2.0) change the default format11:26
vilamasklinn: right, so it looks like your working tree is pointing to a revision that doesn't exist in the associated repo ? How weird11:26
masklinnvila: well that would be the uncommitted revision wouldn't it?11:26
fullermduncommit doesn't remove the rev from the repo.11:26
vilamasklinn: but it should still be in the repo11:26
vilamasklinn: did you try something like 'bzr uncommit -r<unkown_revision>' ?11:27
masklinnjust a plain "bzr uncommit"11:27
vilamasklinn: did you try something like 'bzr uncommit -r<some_revision>' ?11:27
masklinnI'd done a bzr clone -r{something} before because I didn't want the top 2 revisions of the other repository (since I wanted to fix 2575)11:28
masklinnbut uncommit was options-less11:28
j^vila: that was with 2.0.4 will try 2.111:30
vilaj^: make sure the extensions are compiled if you're running from source11:31
vilamasklinn: and you had a valid working tree after your 'bzr branch' ?11:37
masklinnvila: I think so, but I can try brancing to some other repo and doing an info -v just in case11:37
vilamasklinn: filing a bug with a reproducible scenario will be ideal11:38
masklinnwell yeah but I doubt "reproducible 90% of the time on my own machine, never on others" would be reproducible enough ;)11:39
vilamasklinn: that'd be a start towards making it 100% reproducible :) Then we'll can fix it !11:40
masklinnok tried re-cloning the original branch (with the same parameters) to a new one, bzr info -v comes back with a clean bill of health, so it does quite seem like uncommit broke the thing. I'll try clearing my log and re-running the interesting commands11:43
masklinnand this time it worked... oh well (weird though, I get a warning about gtk, why is gtk involved in uncommit?)11:45
fullermdbzr-gtk hooks into it if it's installed.11:48
masklinnfullermd: ok, I'll kill bzr-gtk, the issues might come from that (macports's gtk seems to do nothing but crash on my machine, uncommit's issues might come from there, or the issues might be related)11:49
masklinnwith a bit of luck, it'll unscrew uncommit11:49
krisivesdoes anyone know how to use bzr-git ?11:57
krisivesi cant find any kind of documentation11:57
Kamping_Kaiserbzr help git work?11:58
manueehi everyone11:59
manueedrupal is considering moving (finaly) out of cvs, and pondering other vcs ... it'd b e nice if some of you could chip in http://groups.drupal.org/node/4881812:00
manueei personaly would like us to use bzr, but not knowledgaeble enough to make a statement or to defend it against other options12:00
krisives`bzr help git` only gives me:12:07
krisives"A GIT branch and repository format implementation for bzr."12:07
krisivesmanuee: Good luck, I've noticed a lot of projects blindly hate bzr12:08
krisiveshttp://doc.bazaar.canonical.com/migration/en/why-switch-to-bazaar.html is a good start, and the ultimate argument is simplicity, low barrier of entry, which they should obviously appreciate if they are switching from CVS12:09
manueethanks krisives12:12
krisivesand for a shameless plug: http://santiance.com/2010/01/how-to-synchronize-code-with-bazaar/12:12
masklinnShould documentary lacks of bzr (and extensions) be reported as bugs? Because it isn't exactly clear from its help topics that, in bzr rebase, `-r` can pretty much turn it into a transplant13:17
masklinneven though it seems to work ok13:18
gerard_masklinn: I'd say it's a bug13:26
masklinnok, so I should open a bug on bzr-rebase on their lp page?13:35
=== bindjp_ is now known as bindjp
=== bindjp_ is now known as bindjp
bialixit seems today is holiday, so quiet here14:25
rubbstoday is a holiday?14:30
rubbshello bialix btw.14:30
bialixhello rubbs14:30
bialixmaybe it was my imagination14:31
bialixso quiet here usually on weekends and holidays14:31
rubbsThere is a lot of snow in the US. I don't know if that's part of it. Large parts of the East Coast here are without power.14:31
bialixoh, that's not good14:39
rubbsyeah. I had to spend 45 minutes digging out my car this morning.14:39
rubbsmade it to work though14:40
bialixhi jam, how's you dealing with snow?14:40
jammorning bialix, not really snowing here14:41
bialixrubbs: we have similar problems here14:41
jamI guess to the east and west of me is far worse than here14:41
bialixjam: morning, can you refresh my memory about 2.1 final date?14:41
jamthis week14:41
bialixthat's good14:41
rubbsjam you in Midwest?14:41
jamrubbs: yeah, just south of Chicago14:42
rubbsah. cool. I have friends who live in Elgin (sp?). I was born in Paletine and lived in Aurora for a while14:42
gerard_jam: morning14:48
bialixjam: who is release manager for 2.1 final? poolie?14:51
* bialix looking for summary of new changes in 2.114:51
bialixrats, news entries for 2.0.x and 2.1.0by releases mixed14:54
jambialix: I think I'm still the official 2.1 releaser14:54
=== salgado is now known as salgado-lunch
bialixmay I beg you to write soem summary on changes re 2.0?14:54
bialixthis will be first really big release14:55
bialix6 months of work14:55
jambialix: http://bazaarvcs.wordpress.com/2010/01/18/bazaar-2-1-2/14:55
bialixjam: thanks14:57
* bialix hopes to see nested trees landed in 2.214:58
bialixjam: fyi about qbzr 0.18.1: the tag for this release available in both lp:qbzr/0.18 and trunk. but I suspect you'd like to use lp:qbzr/0.18 for 2.1.x anyway15:00
ronnybtw, what exactly is nested trees?15:00
jambialix: well, it wasn't there when I tried doing the packaging earlier, but it doesn't really matter. As long as your tags can be found, I'll get them15:00
bialixronny: svn:externals, git submodules, hg subrepos15:07
ronnyi see15:11
mathrickhi, what's the best / easiest way to install a post-commit hook in a single repo?15:44
mathrickI'd be happy to be able just to call a shell command, really, scp is all I need15:45
rubbsare you looking for just a mirroring system?15:46
rubbsif so, http://wiki.bazaar.canonical.com/BzrPlugins, under "Publishing" might be what your looking for. There are a few options there.15:47
mathrickright, but I need a single file, more or less15:47
mathrickthe ones I've seen want to push the whole tree I believe15:48
rubbsah, ok.15:48
mathrickso I guess what I need is to read some kind of config on the branch, but how'd I go about it?15:49
rubbsnot sure.15:50
* mathrick reads automirror's source15:50
rubbssorry I couldn't be more help :(15:50
mathricknah, it's fine15:50
bindjphi, was trying to get the bzr explorer to work in snow leopard and with no luck.  The installer looks like it doesn't install it15:51
mathrickbindjp: did you read the note on http://wiki.bazaar.canonical.com/MacOSXDownloads ?15:52
mathrick"he "Desktop" bundles include Bazaar Explorer and QBzr in addition to the contents of the "Core" bundles. It requires that you have the Qt framework installed. For Mac OS X 10.6 Snow Leopard, you must install the 64-bit Qt 4.6.1 framework."15:52
bindjpmathrick: yeah, I installed that15:53
=== salgado-lunch is now known as salgado
bindjpmathrick: maybe there is a way to clean out the previous installs and start again?15:53
mathrickdunno really15:55
bindjpmathrick: I will see what I can find, thanks, just wondered if anybody ran into troubles too15:56
mathrickbindjp: yeah, I was making sure you didn't run into the most obvious issue. I don't really know anything past that, sorry15:57
doctormoI'm getting an odd error when I try and checkout lp:drawberry16:16
doctormoErrorFromSmartServer: Error received from smart server: ('error', "'Inter1and2Helper' object has no attribute 'source_repo'")16:16
james_wbug 51343216:19
ubottuLaunchpad bug 513432 in launchpad-code "AttributeError: 'Inter1and2Helper' object has no attribute 'source_repo'" [Critical,Confirmed] https://launchpad.net/bugs/51343216:19
=== gerard_ is now known as gerard_away
mathrickhmm, how do I get the pathname under which a WorkingTree lives?17:05
bialixrats, unicode error in unshelve --preview17:19
bialixrats rats rats17:19
mathrickvila: thanks17:22
verterokjelmer: hi! fwiw, I just tagged bzr-xmloutput 0.8.6 ;)18:01
ahasenackhey guys, bzr is throwing at me an internal error when trying to checkout a repository18:27
rubbsbug 51343218:29
ubottuLaunchpad bug 513432 in launchpad-code "AttributeError: 'Inter1and2Helper' object has no attribute 'source_repo'" [Critical,Confirmed] https://launchpad.net/bugs/51343218:29
ahasenackis this known? Should I go ahead and file a bug report?18:29
rubbslooks like they're working on it18:30
ahasenackrubbs: thanks18:30
lamalexis anyone here familiar with trac-bzr?18:32
=== radoe_ is now known as radoe
jelmerverterok, hey18:39
jelmerverterok, awesome, I'll make sure it ends up in Debian/Ubuntu18:39
verterokjelmer: cool, thanks! :)18:39
lamalexI can't get it to display different branches18:52
exshi guys. i have a question. i have a inited branche on locale space and want to upload the content to my webspace too. how i have to do this. the documentation irriteded my a little bit.19:34
exsthe best way were. i devel on my local space. and then i have a upload command and after that bzr uploads the whole develcode at my webspace.19:37
exsand it would be greate if i could edit some commands executing before content will uploaded19:38
rubbsso, just to clarify, you want to be able to push just the working directory to a location? or do you want the whole history to go with it?19:38
exsonly the actual revision19:39
exsno history needed19:39
rubbsok, why would you ahve to use bzr? or do you want it do to that while commiting? I guess I'm asking why you couldn't just ftp or sftp or scp the directory to the webspace and not use bzr at all?19:40
exsbecause i used a wiki where other persons can change the code19:40
rubbs*not use bzr to upload at all* is what I ment19:40
rubbsso you want the web space to be versioned as well? so when another person changes it you can get that version?19:41
exsin additions its more comfortable when you are able to upload the whole content to the webspace while commiting19:41
rubbsI'm not quite understanding the set up.19:41
rubbsjust curious, doesn't the wiki have a version control built in?19:42
exsthats right, but its too hard to go hand by hand and look which files were edtied19:42
rubbsah, ok.19:42
exsthe wikipages are txtfiles. and this txtfiles i want to edit on my local space.19:43
rubbswell, there is a problem if someone changes it on the web by hand, you would have to modify the wiki to commit every change to bzr on the webserver.19:44
exsi thought bzr registrate every change automatically19:44
exsthe wikisoftware is dokuwiki. it edit only textfiles saved on my webspace. other user can edit the wikipages too, so i need bzr to synchronize my local code with the code may edited by other users19:46
rubbsso how do you get the code from the webspace, do you just copy it over?19:47
exsi login with ftp19:47
exsthen go to the dir where my files are saved and then copy to my local space19:47
exscan you german maybe?19:48
rubbsexs: sorry my german is REALLY bad. I wouldn't be able to understand you. It isn't your english that is the problem with me asking all the questions. It's just me needing to know how you work, so I can help you figure out how to make bzr work for you ;).19:49
rubbsbzr will understand what has changed automatically between the history you have and the working tree (your revision you work on) that's why you can use diff and the like19:51
rubbsbut it will not automatically know if the directory on your webspace has changed.19:52
exsrubbs: the point is this. i have a bzr branch already where i code my programs. i want to publish the code on my webspace in a certain direcotry where wikiuser can edit the files. after certain time i want to syncronize both branches. maybe the user edited something new, and i added something new in the code and i want others to see it. the files i work on them are simply txtfiles. and dokuwiki just edit simply txtfiles. the whole wiki consists of txtfile19:52
rubbsOk, got it. I think I can help, but I have to use the toilet.... I'll be right back.19:53
exsrubbs: ah now i understand what you mean :) yea that could make a problem. but my idea was that if something has changed so there are difference that bzr will show me this in the next commit and i solve the problem by hand or something like that19:54
rubbsexs: I think I still have an idea that will work, but I'll be right back.19:54
rubbsok, back. Here's my idea:19:58
rubbsyou could create a local branch and create a remote branch on your webspace. When changes happen on the wiki, the remote repo will keep track of them. then to get them to your local branch, you could run "bzr merge --uncommitted ftp://webspace/dir" That will pull all the changes on the webspace. Then you make your changes locally, then do a "bzr push --overwrite" That will put all the changes on your local to the remote.20:01
rubbsthen you can use a plugin like "push and update" to make the working tree become updated.20:02
jelmerverterok, hi20:04
verterokjelmer: hey20:04
rubbsexs: http://doc.bazaar.canonical.com/bzr.2.0/en/user-reference/index.html#merge20:04
jelmerverterok, any chance you can upload a tarball as well?20:04
rubbsexs: hopefully that helps a little20:05
verterokjelmer: already uploaded :)20:05
jelmerverterok: oops20:05
jelmerverterok: ignore me then :-)20:05
exswhy --uncomitted and --overwrite?20:05
verterokjelmer: but it's a 'bzr export' instead of a 'setup.py sdist'20:05
rubbsexs: when the wiki user makes a change, that will not be a part of the history yet (because it was never committed) so when you merge in the "uncommitted" changes, you are pulling all the changes on the webspace.20:07
rubbsexs: the more I think about it the more the --overwrite might not be necessary.20:07
jelmerverterok, uploaded20:10
jelmerverterok, thanks!20:10
verterokjelmer: awesome, thanks!20:10
=== salgado is now known as salgado-afk
exsrubbs: ok thx for help, but i could not try it now but i will try it later. can u answer me another question. what is the sense of repo-init? what exectly do this command?20:56
rubbsexs: init just makes one stand alone branch all that history is stored in that branch. init-repo will create a "shared" space for many branches. This allows you to save disk space when you have multiple branches with similar code. If you are only going to be using 1-2 branches at a time, it isn't that important.20:58
lifelessIs there a 'rhett trapmann' here?22:19
jpdslifeless: He's gone, long gone.22:20
lifelessjpds: was he here at all?22:21
lifelessthe account has been blacklisted (yay)22:21
lifelesshi poolie22:21
jpdslifeless: No, he just got banned from LP.22:21
lifelessbut it was his second account anyway...22:21
lifelessso I expect a third pass until someone actually manages to sit down and explain things.22:21
RAOFI'm having trouble branching lp:launchpad-integration; bzr fails with bzrlib.errors.ErrorFromSmartServer.22:24
RAOFFull error is http://pastebin.ca/1790660 and http://pastebin.com/f1c08c1df22:25
mwhudsonRAOF: are you branching from an old format branch into a 2a repo?22:36
mwhudsonit's a server side bug though, must chase the SAs about getting that deployed22:36
RAOFlp:launchpad-integration has Branch format: Packs 5, and I am branching into a 2a repo.22:37
mwhudsonbranch standalone first or something22:38
RAOFOr, it turns out, branch over http first.22:39
RAOFThat worked.22:39
exscan someone say how to change the message in a commit?23:41
bob2you can't23:42
LeoNerdYou can't. The revision is signed by a checksum.. that checksum is the identity of the revision. If you change the message, you change its identity, and have now broken it.23:42
bob2you can uncommit and recommit with a new message, if you like23:42
LeoNerdWell, not broken.. it's just now different23:42
bob2but that'll confuse anyone who has pulled from you23:42

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