amanica | I assume that the "left parent" is basically the mainline. | 00:44 |
---|---|---|
amanica | does it have a fixed merge_depth=0 ? | 00:44 |
amanica | nevermind. figured it out. stupid question. | 01:06 |
mindlace | is it possible to create a "middleweight" checkout that has some, but not all, of the changesets? | 09:23 |
Peng | Stacked branches might store a bit more data locally. | 09:25 |
mindlace | might or do? | 09:25 |
mindlace | I want to implement/support a "gradual" fetch of history where I "fill in" historical data based on things like network availability | 09:26 |
Peng | Oh, interesting. How will you avoid locking problems? (I mean, the repo has to be write-locked while it's doing this, so it gets in the way of anyone trying to use it.) | 09:31 |
mindlace | aha https://blueprints.launchpad.net/bzr/+spec/shallow-checkouts | 09:31 |
Peng | mindlace: You might want to start with stacked branches, since they support only having partial history locally. Then code something up that gradually fetches more. | 09:32 |
mindlace | yah, just not clear yet on how to cause "gradual fetch" of more | 09:32 |
Peng | No idea! | 09:34 |
Peng | Like Isaid, if you want it to be some sort of background process, locking will be an issue. | 09:34 |
mindlace | yeah… well, i'm not tremendously worried about that for the moment, as it wouldn't be working on 'active' repos ... | 09:40 |
mindlace | the idea is to auto-fetch repos 'nearby' - reported via zeroconf, for example | 09:40 |
mindlace | to support ad-hoc collaboration | 09:40 |
lifeless | mindlace: well, there is bzr share and bzr browse already via bzr-avahi | 09:41 |
lifeless | for precisely adhoc stuff | 09:41 |
Peng | Eh. | 09:42 |
mindlace | well, isn't that fabulous, i love it when things already exist. Thanks, lifeless! | 09:43 |
mindlace | basically I'm trying to build a non-programmer project management tool / CRM with VCS inside … right now bazaar is the winner. (Started with git, moved to checking out mercurial, now I'm at bzr) | 09:44 |
mindlace | only bzr actually has a supported, documented api (bzrlib) and supports non-complete checkouts... | 09:44 |
lifeless | cool | 09:45 |
lifeless | I'm off, ciao. | 09:45 |
Peng | Why do you want shallow checkouts? | 09:45 |
Peng | lifeless: See ya. :) | 09:45 |
Peng | "See ya"? I never say that. | 09:45 |
fullermd | Well, obviously one of you is lying. | 09:46 |
mindlace | hm… well, I want to implement "search" across all repos who are using this cms-thingy … and have results of search be auto-fetched | 09:46 |
mindlace | I had the idea that search results may return historical results but I guess I can simplify things by skipping that for the moment | 09:47 |
mindlace | (historical results - to fetch, then, you would need that historical revision -> present) | 09:48 |
mindlace | I guess I also want fragmentary checkouts ;P | 09:48 |
mindlace | hm… seems like sub-tree kind-of gets there... | 09:55 |
mindlace | oh hey, lifeless was robert collins | 10:20 |
mindlace | oh well guess i'll catch him when he's aboot | 10:21 |
Kamping_Kaiser | mindlace: I suspect you'll find he still is robert collins :) | 10:22 |
mindlace | just figured that out. | 10:22 |
waltercruz | Hi ! | 14:05 |
waltercruz | I'm getting a error like that: | 14:05 |
waltercruz | bzr: ERROR: Revision {walter.php@gmail.com-20091019135859-x986fv0x73323qpy} not present in "KnitPackRepository('file:///home/walter/repositories/whissip-dev/.bzr/repository/')". | 14:05 |
waltercruz | I tried to bzr check, but it don't works | 14:05 |
waltercruz | can I just remove that entry from bzr index? | 14:05 |
waltercruz | withouth it, evertything is ok | 14:06 |
jelmer | waltercruz: when do you get that error? | 14:07 |
waltercruz | hum.. a lot of operations :( can't remember 100% | 14:07 |
waltercruz | I upgraded my repository with upgrade -rich root.. sent it to launchapd | 14:07 |
waltercruz | and when I tried to merge another branch.. I got this error | 14:07 |
jelmer | waltercruz: I mean, what operation prints that error exactly? | 14:08 |
waltercruz | bzr log | 14:08 |
waltercruz | but | 14:08 |
waltercruz | bzr log -r-1 | 14:08 |
waltercruz | ------------------------------------------------------------ | 14:08 |
waltercruz | revno: 1 [merge] | 14:08 |
waltercruz | committer: Walter Cruz <walter.php@gmail.com> | 14:08 |
waltercruz | branch nick: whissip-dev | 14:08 |
waltercruz | timestamp: Sun 2009-11-01 11:44:04 -0200 | 14:08 |
waltercruz | message: | 14:08 |
waltercruz | whissip merge | 14:08 |
waltercruz | ------------------------------------------------------------ | 14:08 |
waltercruz | Use --include-merges or -n0 to see merged revisions. | 14:08 |
waltercruz | works | 14:08 |
waltercruz | looks like I have a entry in the index... but no commit with that ID. | 14:09 |
waltercruz | I suppose ;) | 14:09 |
jelmer | waltercruz: so "bzr log" immediately errors out saying that it doesn't have that particular revision? | 14:10 |
waltercruz | yes | 14:10 |
waltercruz | (bzr)walter@waltercruz:~/repositories/whissip-dev$ bzr log | 14:10 |
waltercruz | bzr: ERROR: Revision {walter.php@gmail.com-20091019135859-x986fv0x73323qpy} not present in "KnitPackRepository('file:///home/walter/repositories/whissip-dev/.bzr/repository/')". | 14:10 |
fullermd | Wait, revno 1 is a merge? | 14:25 |
fullermd | Oh, nm, it presumably just be getting that from missing that rev as the parent... | 14:26 |
fullermd | Try log -r-1 --show-ids | 14:26 |
fullermd | 'll probably say that missing rev is its parent. | 14:26 |
waltercruz | (bzr)walter@waltercruz:~/repositories/whissip-dev$ bzr log -r-1 --show-ids | 14:28 |
waltercruz | ------------------------------------------------------------ | 14:28 |
waltercruz | revno: 1 [merge] | 14:28 |
waltercruz | revision-id: walter.php@gmail.com-20091101134404-9vahhw9duq5fjolg | 14:28 |
waltercruz | parent: walter.php@gmail.com-20091019135859-x986fv0x73323qpy | 14:28 |
waltercruz | parent: walter.php@gmail.com-20091031152550-jbf3xxslieifdpir | 14:28 |
waltercruz | committer: Walter Cruz <walter.php@gmail.com> | 14:28 |
waltercruz | branch nick: whissip-dev | 14:28 |
waltercruz | timestamp: Sun 2009-11-01 11:44:04 -0200 | 14:29 |
waltercruz | message: | 14:29 |
waltercruz | whissip merge | 14:29 |
waltercruz | ------------------------------------------------------------ | 14:29 |
waltercruz | yes. | 14:29 |
waltercruz | my repository screwd up somehow. | 14:29 |
waltercruz | when I did a bzr check | 14:29 |
waltercruz | and after that a bzr reconcile | 14:29 |
waltercruz | I was with no revisions | 14:30 |
waltercruz | bzr log showed nothing. | 14:30 |
waltercruz | so I did a bzr merge 0..-1 theonethatIbranched.. after that, I stucked with that error in bzr log | 14:31 |
fullermd | The merge didn't cause the error, it just turned the existing screwup into a somewhat different screwup. | 14:33 |
fullermd | The problem existed the moment your tree base rev wasn't available from its branch's repo. | 14:33 |
fullermd | I don't know any way to make bzr do that, without trying to or poking around manually behind its back. Disk corruption of some sort, maybe. | 14:33 |
waltercruz | hum... | 14:34 |
fullermd | You could try running 'check --repo', maybe, to bypass branch/tree checks and see if it turns up anything just in the repo. | 14:34 |
waltercruz | strange. | 14:34 |
waltercruz | will try! | 14:34 |
waltercruz | KeyError: ('hacks.php-20090901021751-ck5pvqni080475dt-1', 'walter.php@gmail.com-20090916150844-ky37u7u3erm116a0') | 15:05 |
waltercruz | bzr 2.1.0b1 on python 2.5.2 (Linux-2.6.30.5-linode20-i686-with-debian-5.0.3) | 15:05 |
waltercruz | arguments: ['/home/walter/.virtualenvs/bzr/bin/bzr', 'check', '--repo'] | 15:05 |
waltercruz | encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'pt_BR.UTF-8' | 15:05 |
waltercruz | plugins: | 15:05 |
waltercruz | launchpad /home/walter/.virtualenvs/bzr/lib/python2.5/site-packages/bzr-2.1.0b1-py2.5-linux-i686.egg/bzrlib/plugins/launchpad [2.1.0b1] | 15:05 |
waltercruz | netrc_credential_store /home/walter/.virtualenvs/bzr/lib/python2.5/site-packages/bzr-2.1.0b1-py2.5-linux-i686.egg/bzrlib/plugins/netrc_credential_store [2.1.0b1] | 15:05 |
waltercruz | *** Bazaar has encountered an internal error. This probably indicates a | 15:05 |
waltercruz | bug in Bazaar. You can help us fix it by filing a bug report at | 15:05 |
waltercruz | https://bugs.launchpad.net/bzr/+filebug | 15:05 |
waltercruz | including this traceback and a description of the problem. | 15:05 |
waltercruz | (just part of traceback( | 15:06 |
waltercruz | ) | 15:06 |
RenatoSilva | It would be so nice to edit comments in history without uncommit | 19:16 |
RenatoSilva | Specially when you find out that you have been calling combo box a drop-down list for so long time o.O | 19:17 |
RenatoSilva | How to hack the bzr metadata to edit them? | 19:21 |
igc | morning | 20:29 |
Peng | Good morning. :) | 20:29 |
igc | hi Peng | 20:30 |
lifeless | hi igc, up early! | 21:07 |
igc | hi lifeless. yup. Crazy day today | 21:21 |
* igc breakfast | 21:28 | |
lifeless | jelmer: bug 172360 | 21:29 |
ubottu | Launchpad bug 172360 in bzr "branching from rich-root to non-rich-root gives confusing errors" [Medium,Triaged] https://launchpad.net/bugs/172360 | 21:29 |
lifeless | jelmer: why did you change it from invalid? | 21:29 |
jelmer | lifeless: it was changed to incomplete without explanation, and the error message is still unclear | 22:18 |
lifeless | jelmer: it was changed to invalid after john said 'this is wont fix by design' | 22:20 |
lifeless | jelmer: I'm happy with it being open, but it needs an explanation as to what we're intending to do | 22:20 |
jelmer | lifeless: fair enough - I've commented | 22:27 |
jelmer | lifeless: fwiw it was changed to invalid before john said 'this is wont fix by design', | 22:28 |
jelmer | and john changed the importance to medium | 22:28 |
lifeless | oh right | 22:31 |
spiv | Good morning. | 23:01 |
igc | bbl | 23:38 |
poolie | hello spiv | 23:48 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!