| bpeterson | could the problem be in unlocking? | 00:01 |
|---|---|---|
| === kiko is now known as kiko-afk | ||
| lifeless | yes | 00:06 |
| lifeless | or some interaction | 00:06 |
| lifeless | please file a bug | 00:06 |
| bpeterson | ok, will do | 00:07 |
| bpeterson | thanks for the help | 00:07 |
| beuno | yay! loggerhead revision view down from 2.9sec to 0.2 | 00:46 |
| * beuno commits | 00:46 | |
| bister | Is there a way to configure a repository to accept only signed commits? | 01:07 |
| === tro|| is now known as tro | ||
| lifeless | beuno: nice | 01:31 |
| lifeless | thatch: hi; you might have an answer to this... is there a good, low-dependency python IR/text indexer around ? | 02:21 |
| thatch | not aware of one... but that's not an easy problem to solve (especially if you need multilingual stemming) | 02:22 |
| thatch | what do you need one for? | 02:23 |
| lifeless | searching bzr repositories | 02:24 |
| lifeless | you know bonsai for instance, or fisheye | 02:24 |
| thatch | ok | 02:25 |
| lifeless | I don't see why the core storage should be the web apps domain | 02:25 |
| lifeless | I can easily imagine nice text clients | 02:25 |
| thatch | I think I looked at Lupy and PyLucene a while back but haven't particularly used either | 02:26 |
| beuno | argh, loggerhead on LP slowly dying again... :( | 02:26 |
| lifeless | beuno: when can we start deploying your zpt branch | 02:27 |
| lifeless | ignoring fancy css etc its better already | 02:27 |
| lifeless | thatch: have you seen the template engine discussions going on here | 02:28 |
| beuno | lifeless, I'm mainly doing some cleaning, so, if I put a good amount of hours this weekend, I can probably have something up for review on your monday morning. Not sure if mwhudson__ will have time to review it though | 02:28 |
| lifeless | I imagine it will be a priority for him :) | 02:30 |
| === tro|| is now known as tro | ||
| beuno | well, I'll make sure first thing monday, to do any tweaks needed | 02:31 |
| thatch | lifeless: nope, I don't think I've been in #bzr for a week. I can check the logs, was it today? | 02:31 |
| beuno | I also cleaned up all the deprecated methods, so it won't be hanging from a thread everytime bzr gets updated on LP | 02:32 |
| beuno | lifeless, css and all visual goodness is delayed til we know what 2.0 will actually look like, so we can have something accordingly | 02:41 |
| beuno | basically, colors and some other visual elements will change a bit from the last draft | 02:42 |
| beuno | better CSS should make rendering faster too. There are a lot of areas we can still easily improve performance-wise | 02:42 |
| beuno | I even have an evil idea to get rid of the sqlite cache completely, but I still have to go over it with mwhudson__ | 02:43 |
| * beuno commits, pushes, and goes to dinner | 02:54 | |
| lifeless | thatch: basically the loggerhead template enginge is largely why its slow | 03:35 |
| lifeless | beuno knows more | 03:35 |
| lifeless | I think they looked at a couple of others but found zpt is actually leanest/fastest | 03:35 |
| lifeless | beuno: I have been encouraging removal fo the cache for a while ;P | 03:36 |
| === tro|| is now known as tro | ||
| toyto1 | hello guys, where I can download a paramiko? | 03:56 |
| spiv | toyto1: http://www.lag.net/paramiko/ | 04:01 |
| toyto1 | thanks spiv, got it already :) | 04:03 |
| spiv | toyto1: great :) | 04:03 |
| === tro|| is now known as tro | ||
| keir | how impossible would it be to add custom diff support to bzr? for e.g. storing XML files where custom diff / merge handlers must be used and bzr should not interpret the data | 05:36 |
| toyto1 | guys i run this in my local computer | 06:05 |
| toyto1 | bzr init-repo --no-trees sftp://toytoy@192.168.2.10/home/toytoy/repositories/ | 06:05 |
| toyto1 | bzr init sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing | 06:05 |
| toyto1 | then in the other computer I try | 06:06 |
| toyto1 | bzr checkout sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing testing-local | 06:06 |
| toyto1 | how can i checkout the code or the whole testing project scripts? | 06:07 |
| toyto1 | when I try to go to $PWD/testing-local/ i thought the scripts of the project will be residing in there | 06:07 |
| toyto1 | how to do that? | 06:07 |
| === mwhudson__ is now known as mwhudson | ||
| lifeless | keir: we have that | 06:19 |
| lifeless | keir: we disambiguate delta-storage and user-diffs | 06:19 |
| lifeless | delta storage is currently always a binary-safe line orientated delta | 06:20 |
| lifeless | but user diffs are pluggable | 06:21 |
| lifeless | toyto1: init creates a tree or branch, it doesn't add files | 06:21 |
| lifeless | toyto1: you need to: | 06:21 |
| lifeless | do a checkout | 06:21 |
| lifeless | copy your files in | 06:21 |
| lifeless | do bzr add | 06:21 |
| lifeless | bzr commit | 06:21 |
| lifeless | then in your testing-local checkout you can do bzr update and it will get the files | 06:22 |
| toyto1 | lifeless: let's assume that there are 3 computers involve where the sftp:sftp://toytoy@192.168.2.10/home/toytoy/repositories/ would be the server that has the script repo | 06:23 |
| toyto1 | let's say in my local pc that has the scripts located in /home/www/testing/*where my scripts of project* | 06:24 |
| toyto1 | and i'm on that directory then issuing this command to server | 06:24 |
| toyto1 | bzr init-repo --no-trees sftp://toytoy@192.168.2.10/home/toytoy/repositories/ | 06:24 |
| toyto1 | and | 06:24 |
| toyto1 | bzr init sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing | 06:24 |
| lifeless | that will have made a branch at sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing with no commits in it | 06:24 |
| lifeless | you can run 'bzr log sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing' to see this ;P | 06:25 |
| toyto1 | i see i'll try | 06:25 |
| toyto1 | lifeless: let's say at first i'm going to cd /home/www/testing | 06:26 |
| lifeless | it doesn't matter where you cd to | 06:26 |
| toyto1 | I won't do bzr init myrpoject anymore right? | 06:26 |
| lifeless | init URL only affects URL | 06:26 |
| toyto1 | instead i'll use this | 06:26 |
| toyto1 | bzr init-repo --no-trees sftp://toytoy@192.168.2.10/home/toytoy/repositories/ | 06:26 |
| toyto1 | in that way, i want to decentralized the scripts of the project. did I follow the idea? | 06:26 |
| lifeless | I think you are confused about what init does | 06:27 |
| lifeless | it creates an *empty* branch, it does not *add your data to it* | 06:27 |
| toyto1 | lifeless: can you do me a favor so that I can clearly understand it, can you tell me step by step with it involving the | 06:28 |
| toyto1 | bzr init-repo --no-trees sftp://toytoy@192.168.2.10/home/toytoy/repositories/ | 06:28 |
| toyto1 | command | 06:28 |
| lifeless | toyto1: where are your existing scripts | 06:28 |
| toyto1 | my friend told that in that way, we can decentralized the scripts | 06:28 |
| toyto1 | okay | 06:28 |
| toyto1 | let's say here in my local pc | 06:28 |
| toyto1 | it's in | 06:28 |
| toyto1 | /home/www/testing | 06:29 |
| lifeless | ok | 06:29 |
| lifeless | cd /tmp | 06:29 |
| toyto1 | ok | 06:29 |
| toyto1 | then | 06:29 |
| lifeless | bzr checkout sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing | 06:29 |
| lifeless | cp -a /home/www/testing/* . | 06:29 |
| lifeless | bzr add | 06:29 |
| lifeless | bzr commit -m 'import scripts' | 06:29 |
| lifeless | oh hmm, missed a command | 06:29 |
| lifeless | bzr checkout .. | 06:30 |
| lifeless | cd testing | 06:30 |
| lifeless | then cp -a | 06:30 |
| lifeless | and so on | 06:30 |
| toyto1 | let me try :) | 06:30 |
| keir | lifeless, is it possible to tell bzr to never merge? or to use external merge programs? | 06:30 |
| lifeless | keir: the former not as such; the latter I think so, or at least, one can write a plugin to enable that | 06:31 |
| lifeless | (which is not quite the same thing, I know) | 06:31 |
| keir | hmm, ok. i am envisioning a system where a textual merge is strictly incorrect and should never be attempted... so bzr needs to be extended to do this? | 06:32 |
| Peng | There's an extmerge plugin. | 06:32 |
| lifeless | I believe we have all the necessary machinery | 06:32 |
| Peng | (I think that's its name.) | 06:32 |
| lifeless | some assembly required | 06:32 |
| keir | yup, ok. | 06:33 |
| lifeless | which is to say you can get what you want without patching bzr itself, or deep voodoo | 06:34 |
| lifeless | but I may be wrong :P | 06:34 |
| keir | alright. it's ok if i have to patch bzr, i was just curious | 06:34 |
| lifeless | :) | 06:35 |
| toyto1 | lifeless: it says | 06:38 |
| toyto1 | Committed revision 1. | 06:38 |
| toyto1 | after issuing the bzr commit -m 'import testing scripts' | 06:38 |
| lifeless | right | 06:38 |
| toyto1 | and then what's next after it? | 06:38 |
| lifeless | now, go somewhere you want to get a new copy of the scripts - your third machine | 06:39 |
| toyto1 | lifeless: okay let's say in this computer again but in different directory | 06:39 |
| lifeless | sure | 06:40 |
| lifeless | cd there | 06:40 |
| toyto1 | lifeless: let's say in my /home/mypc/Desktop/repo <- im here now | 06:40 |
| lifeless | and do bzr checkout ... | 06:40 |
| toyto1 | ok trying... | 06:40 |
| toyto1 | wow it's there already ;) | 06:41 |
| toyto1 | and now since i'm in this director /home/mypc/Desktop/repo/testing | 06:41 |
| toyto1 | let's say i'll edit test.txt | 06:41 |
| toyto1 | after I will bzr commit -m 'i did edit test.txt' | 06:42 |
| toyto1 | will it automatically sync with the scripts from the server? | 06:42 |
| toyto1 | or update that script also? | 06:42 |
| lifeless | it will write to the database on the server | 06:42 |
| lifeless | in a file in .bzr there | 06:43 |
| lifeless | on the other machine, where you have done bzr checkout, you can do 'bzr update' to sync | 06:43 |
| toyto1 | lifeless: wow ;) I get it thank you so much :) | 06:44 |
| toyto1 | now i can bzr diff sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing too right? | 06:44 |
| toyto1 | hmm it doesn't return or say anything since I edited and commited one of the file there | 06:46 |
| toyto1 | after issuing bzr diff sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing | 06:46 |
| lifeless | you can just do 'bzr diff' | 06:46 |
| lifeless | and it will tell you whethe ryou ahve edited anything or not | 06:46 |
| toyto1 | lifeless: it doesn't tell anything. Again, i tried modifyng one of the scripts. But after modifying it, when i issue bzr commit -m 'modifying the 3rd script' | 06:48 |
| toyto1 | it goes to the server opening sftp | 06:48 |
| toyto1 | then updates the script and says | 06:48 |
| toyto1 | Commited 3 | 06:48 |
| lifeless | sure | 06:48 |
| lifeless | thats what I would expect | 06:49 |
| lifeless | modify the script but don't commit | 06:49 |
| lifeless | then run 'bzr diff' | 06:49 |
| toyto1 | ah i'll try | 06:49 |
| toyto1 | ah i see so lifeless, it will show bzr diff if not yet commited right? | 06:50 |
| lifeless | yes | 06:51 |
| toyto1 | hence if commited, then it will update there and finalize it. | 06:51 |
| lifeless | is that what you wanted to know, or something else? | 06:51 |
| toyto1 | ah i see, thanks lifeless... | 06:51 |
| toyto1 | yeah that's it | 06:51 |
| toyto1 | when I try to unlink test.txt | 06:51 |
| toyto1 | then bzr diff it shows the contents | 06:51 |
| toyto1 | and says it was removed... | 06:51 |
| toyto1 | then when i issue bzr commited -m 'removed test.txt' | 06:52 |
| toyto1 | it did open a log file | 06:52 |
| toyto1 | then how other developers would see that log? | 06:52 |
| lifeless | 'bzr log' | 06:52 |
| lifeless | also 'bzr log -v' | 06:52 |
| toyto1 | bzr diff sftp://toytoy@192.168.2.10/home/toytoy/repositories/testing | 06:52 |
| toyto1 | ah i see | 06:52 |
| toyto1 | so bzr log lifeless, underneath to it, it does go to the server and gets information on their right, then it will return back to the user by just that 'bzr log' | 06:53 |
| lifeless | yes | 06:53 |
| lifeless | if they do not have a checkout you can do 'bzr log URL' | 06:54 |
| toyto1 | bzr log URL (URL can be from sftp)? because I found most examples using http | 06:54 |
| lifeless | yes | 06:55 |
| toyto1 | hmm lifeless back to the /tmp/testing directory | 06:56 |
| toyto1 | when i try bzr log sftp://toytoy@192.168.2.10/home/toyoy/repositories/testing | 06:56 |
| toyto1 | it says | 06:56 |
| toyto1 | onbzr: ERROR: Not a branch: "sftp://toytoy@192.168.2.10/home/toyoy/repositories/" | 06:56 |
| lifeless | you made a spelling error I think | 06:57 |
| lifeless | toyoy is not how you spelt it earlier | 06:57 |
| toyto1 | hehe yeah | 06:57 |
| toyto1 | lifeless: 0-0 wow ! :) | 06:58 |
| toyto1 | love it, thanks for your help. I understand it now. my friends tutorial seems to be chatty and confusing x( | 06:58 |
| toyto1 | thanks for your brief tutorial. I love it ;) | 06:58 |
| lifeless | my pleasure | 07:00 |
| gour | finally, svn-1.5 next week | 07:38 |
| gour | 'new' life for bzr-svn | 07:39 |
| === emgent_ is now known as emgent | ||
| lifeless | finally | 09:00 |
| lifeless | I have removed the last weave_store reference | 09:00 |
| nxvl | hi | 09:22 |
| nxvl | i'm having problems uploading to lp's bzr | 09:22 |
| lifeless | go on | 09:22 |
| nxvl | i'm trying to bzr push lp:terminator | 09:22 |
| nxvl | as it says on the code page | 09:23 |
| nxvl | but it's trying to upload via http | 09:23 |
| nxvl | which is not working | 09:23 |
| lifeless | have you told bzr your lp username ? | 09:23 |
| nxvl | and i do that how? | 09:24 |
| Peng | bzr launchpad-login | 09:24 |
| nxvl | with bzr whoami? | 09:24 |
| * nxvl tries | 09:25 | |
| nxvl | woohoo | 09:25 |
| nxvl | thanks | 09:25 |
| nxvl | i didn't knew about the new bzr changes | 09:25 |
| nxvl | i didn't upload anything since "bzr push bzr+ssh" | 09:25 |
| nxvl | thanks | 09:25 |
| * nxvl HUGS lifeless and Peng | 09:25 | |
| Peng | You could've still manually done that. | 09:26 |
| Peng | lp: URLs are just simple shortcuts. | 09:26 |
| Peng | They translate to http if you're not logged in, or bzr+ssh if you are. | 09:26 |
| nxvl | :D | 09:26 |
| nxvl | thnz | 09:26 |
| nxvl | thnx | 09:26 |
| === gour is now known as gour|afk | ||
| === pmezard is now known as pmezard|afk | ||
| mathrick | hiya, how do I add subtrees to a branch? | 10:56 |
| mathrick | I have it in rich-root-pack already | 10:56 |
| mathrick | mathrick@hatsumi:~/elisp$ bzr join --reference dvc | 12:03 |
| mathrick | bzr: ERROR: Cannot join dvc. Trees have the same root id. | 12:03 |
| mathrick | huh? | 12:03 |
| mathrick | they're most definitely two different trees | 12:04 |
| LarstiQ | but their root ids could be the same | 12:05 |
| edreamleo | Hello all. bzr version numbers after merges are causing great confusion with the Leo and IPython projects. Somebody on the Leo project said "if everyone starts with rev 505 and does some stuff and commits on after another you can't all get 506." which makes sense to me. Is this issues documented anywhere? If not, I think you could help lots of people, including me, if you did so. | 12:05 |
| Peng | What? | 12:06 |
| mathrick | LarstiQ: howso? | 12:06 |
| mathrick | edreamleo: no, each of the trees will have its own rev 505 | 12:07 |
| mathrick | depending on how you merge, the other "505s" will end up as different revisions in your tree | 12:07 |
| mathrick | revno is only meaningful for a single tree | 12:08 |
| mathrick | what matters cross-tree is that the revisions are the same | 12:08 |
| LarstiQ | mathrick: before there was rich root support, all the root ids (fileid of /) were TREE_ROOT | 12:08 |
| mathrick | LarstiQ: oh | 12:08 |
| mathrick | LarstiQ: how can I change that? | 12:08 |
| LarstiQ | mathrick: import bzrlib.branch; bzrlib.branch.Branch.open('.').basis_tree().path2id('/') | 12:08 |
| mathrick | the top-level repo is under my control | 12:09 |
| LarstiQ | mathrick: hmm, been a while | 12:09 |
| * LarstiQ knows how to set if through the bzrlib api, but not sure on what the procedure is in converting an older branch | 12:10 | |
| edreamleo | mathrick: it seems that rev numbers aren't documented. It would be "soothing" to newbies if we could understand where rev numbers like 507.2.2 came from. True, bzr log does show the renumbered branches, but I think a discussion in the docs somewhere would help. | 12:10 |
| LarstiQ | edreamleo: revnos are determined by the lefthand side ('mainline') of the revision DAG of a branch | 12:12 |
| LarstiQ | edreamleo: as an aside, revids (and not revnos) globally uniquely define a revision. See bzr log --show-ids for example | 12:13 |
| mathrick | edreamleo: hmm, is that really an issue? It only shows up in commit logs for merge revisions, where you can immediately see it's a merge | 12:14 |
| LarstiQ | edreamleo: Merged revisions, the indented ones in bzr log output, get dotted revnos, the first number is the same as the revno of the revision in the current branch where they branched from. | 12:14 |
| mathrick | otherwise the whole merge will be just 506 in your tree | 12:15 |
| mathrick | LarstiQ: if you can give me a snippet to set it on a fresh tree, it's no problem, I can just replay commits onto the new branch | 12:16 |
| LarstiQ | mathrick: on a fresh tree created with a rich root format, it should already be rich. | 12:17 |
| mathrick | aha | 12:17 |
| LarstiQ | mathrick: you don't want to keep your revisions? | 12:17 |
| edreamleo | mathrick: It's "really" an issue only in the sense that it confuses newbies. True, the log is about as clear as it could be. The problem is, that newbies think there recently committed changes went away, depending on what the "main" revno is, and newbies then don't think to look at the log. I strongly suspect the revnums are fine, it's just a learning problem with bzr. But I know for sure that it is confusing for several sets of n | 12:18 |
| mathrick | LarstiQ: I do, but can't I merge/replay them from the old tree? | 12:18 |
| LarstiQ | mathrick: you can merge them, 'replay' made me think of something different | 12:18 |
| mathrick | although to be honest, in that particular tree I don't care all that much, as long as functionally equivalent revs are present, it's just my conf dir | 12:18 |
| LarstiQ | mathrick: you should be able to do something with moving things to a subdir, then merging into a new tree and removing everything to the root, or some such | 12:19 |
| mathrick | "removing everything to the root"? | 12:19 |
| mathrick | edreamleo: your message got truncated | 12:20 |
| mathrick | after " several sets of" | 12:20 |
| LarstiQ | mathrick: sorry, 'removing' is ambigious | 12:20 |
| LarstiQ | mathrick: that should be 'moving everything back to' | 12:20 |
| edreamleo | mathrick: sorry about that. Some forums like one-liners. | 12:21 |
| edreamleo | mathrick: It's "really" an issue only in the sense that it confuses newbies. True, the log is about as clear as it could be. | 12:21 |
| edreamleo | mathrick: The problem is, that newbies think there recently committed changes went away, depending on what the "main" revno is, and newbies then don't think to look at the log. | 12:21 |
| edreamleo | mathrick: I strongly suspect the revnums are fine, it's just a learning problem with bzr. But I know for sure that it is confusing for several sets of newbies. | 12:22 |
| LarstiQ | edreamleo: have you seen the revision ids with --show-ids? | 12:23 |
| mathrick | edreamleo: ah, so you mean they branch at 504, commit "foo" at 505, merge someone else's tree where 505 is "bar", then wonder why they still don't have the bar in their tree, since 505 is "foo"? | 12:23 |
| edreamleo | mathrick: yes, I believe that something like that is what is confusing folks. | 12:25 |
| mathrick | edreamleo: that is a problem when you think of "the" repo and checkouts, instead of a set of DAGs | 12:25 |
| edreamleo | To repeat, once people think to look at the log they are probably going to be reassured | 12:26 |
| mathrick | edreamleo: however, how do they find out 505 is "foo" and not "bar" if not through the log? | 12:26 |
| edreamleo | Interesting. Afaik, dag's are never mentioned in the docs. | 12:26 |
| mathrick | I guess a little technical aside mentioning DAGs and how trees being DAGs means they can be non-identical yet equivalent could help | 12:28 |
| edreamleo | mathrick: here is the original report on http://groups.google.com/group/leo-editor | 12:28 |
| edreamleo | I committed the leoSettings.leo file with a couple of vi emulator changes as revision 509. | 12:29 |
| edreamleo | Later, with Edwards updates the leoSettings.leo changes moved to revision 511 and the revision description that I entered is gone. | 12:29 |
| edreamleo | That's the essence of the report. Does that make any sense to you? I'm totally confused :-) | 12:30 |
| * LarstiQ starts up X and a browser | 12:30 | |
| mathrick | edreamleo: this one? http://groups.google.com/group/leo-editor/browse_thread/thread/a207aa1ba5247363 | 12:30 |
| edreamleo | mathrick: yes, that's the thread | 12:31 |
| mathrick | edreamleo: ok, did you commit on a branch and pushed, or committed on a checkout? | 12:32 |
| edreamleo | my workflow is to commit and push | 12:32 |
| mathrick | the two look similar, but are fundamentally different when it comes to commits | 12:32 |
| mathrick | edreamleo: aha, then indeed you will never get the same revnos if there's been intermediate traffic on the target branch | 12:33 |
| mathrick | edreamleo: can I have your mainline branch URL? | 12:33 |
| edreamleo | mathrick: https://code.launchpad.net/~leo-editor-team/leo-editor/trunk | 12:35 |
| mathrick | edreamleo: ah, yes, I suppose you have looked at the log already? | 12:38 |
| mathrick | if no, bzr log https://code.launchpad.net/~leo-editor-team/leo-editor/trunk | less | 12:38 |
| LarstiQ | edreamleo: http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#understanding-revision-numbers | 12:38 |
| LarstiQ | edreamleo: and also 1.2.2, http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#id19 | 12:39 |
| edreamleo | LarstiQ: thanks for these urls! | 12:40 |
| LarstiQ | edreamleo: np :) | 12:41 |
| mathrick | LarstiQ: I suppose specifically mentioning implications of merges in http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#understanding-revision-numbers would help, tho | 12:41 |
| edreamleo | mathrick: Aha. I have only looked at my local log... | 12:41 |
| LarstiQ | mathrick: yes, patches appreciated :) | 12:41 |
| LarstiQ | mathrick, edreamleo: or something for http://bazaar-vcs.org/FAQ | 12:41 |
| mathrick | LarstiQ: ok, how do I contribute to the FAQ? | 12:42 |
| LarstiQ | mathrick: I think the FAQ is just a wiki page | 12:43 |
| mathrick | ah | 12:43 |
| LarstiQ | at least, I can't find it in the bzr.dev source tree | 12:43 |
| LarstiQ | mathrick: for the user-guide, bzr.dev/doc/en/user-guide/zen.txt | 12:44 |
| mathrick | mhm | 12:44 |
| mathrick | edreamleo: out of curiosity, what is your local log like? The revisions should stay intact there | 12:46 |
| edreamleo | Thanks all. I'll post this discussion on the thread I gave above on leo-editor. I think it will help. | 12:46 |
| edreamleo | mathrick: it looks the same as the global log to my untrained eyes. | 12:47 |
| mathrick | oh, do you have an URL? | 12:47 |
| LarstiQ | edreamleo: http://doc.bazaar-vcs.org/latest/en/user-reference/bzr_man.html#id27 might also be of use | 12:47 |
| LarstiQ | edreamleo: you can do things like bzr diff -r -3..-1 for example | 12:48 |
| LarstiQ | edreamleo: the key thing to take away here is that what uniquely identifies a revision is the revision _id_ (revid for short, example: pqm@pqm.ubuntu.com-20080606135624-1ambbf8pct52xfh8) and a revision _number_ (revno for short, simple integers for mainline revisions, or dotted for merged) is just a convenient shorthand in a particular branch | 12:50 |
| edreamleo | LarstiQ: thanks. I'll post this to leo-editor. | 12:51 |
| LarstiQ | edreamleo: the former is always the same for a particular revision, the latter can change if the mainline changes. (I locally commit 505, someone else can merge that into their 505, then mine will probably be 504.1.1) | 12:51 |
| LarstiQ | edreamleo: also practice with `bzr log --show-ids -r -3..-1` and then `bzr diff -r revid:<a revid here>..revid:<and likewise here>` | 12:52 |
| LarstiQ | edreamleo: that should give your users/developers a better grasp on the differences I hope. | 12:52 |
| edreamleo | LarstiQ: Excellent: practical usage tips will certainly help. | 12:54 |
| LarstiQ | edreamleo: and as mathrick said, if people fear their changes have been lost, have a good look at the log output and search for merged revisions. (You can search for a commit log with `bzr log -m <pattern>`) | 12:54 |
| LarstiQ | edreamleo: oh! And `bzr missing` | 12:54 |
| LarstiQ | edreamleo: bzr missing will compare two branches and tell you which revisions the one has the other hasn't. | 12:54 |
| edreamleo | Ok. Enough for now. This is plenty for us newbies to digest. Again, many thanks. | 12:56 |
| * LarstiQ stops :) | 12:57 | |
| LarstiQ | edreamleo: feel free to ask more questions later on. | 12:57 |
| === Toksyuryel` is now known as Toksyuryel | ||
| mathrick | LarstiQ: http://bazaar-vcs.org/FAQ#head-c45efef970ac690a0e997fbc904c3ea989e3fcea <-- looks good? | 13:18 |
| mathrick | hmm | 13:40 |
| mathrick | that merge messed up my history somehow | 13:41 |
| mathrick | I get revnos such as -3 now | 13:41 |
| bpeterson | lifeless: are you there? | 13:46 |
| Pieter | revision numbers suck | 13:50 |
| mathrick | I recreated it, and I still can't get a tree with root id other than TREE_ROOT | 13:57 |
| mathrick | if I pull from the existing branch onto an empty tree, I will get the same id | 13:57 |
| LarstiQ | mathrick: looks good to me | 13:57 |
| LarstiQ | mathrick: ah yes, the root id is only set after the first commit | 13:58 |
| LarstiQ | Pieter: they're perfectly fine if you know what they are | 13:58 |
| mathrick | yeah, and if I commit, the branches become unmergeable | 13:58 |
| LarstiQ | ok, let me see if I can figure out how to do this | 13:59 |
| * LarstiQ will be afi for a couple of minutes | 13:59 | |
| mathrick | if I commit after merge, I get this: | 13:59 |
| mathrick | deleted | 13:59 |
| mathrick | working tree is out of date, run 'bzr update' | 13:59 |
| mathrick | Committed revision 1. | 13:59 |
| === asabil_ is now known as asabil | ||
| lifeless | hi | 14:33 |
| lifeless | LarstiQ: can blender edit art of illusion files ? | 15:17 |
| LarstiQ | lifeless: never heard of art of illusion before, no clue what fileformats it supports | 15:18 |
| === pmezard|afk is now known as pmezard | ||
| Keybuk | did something change in difftools? | 15:59 |
| Keybuk | I'm sure that bzr diff --using=meld used to open one window with the changes | 16:00 |
| Keybuk | now it opens one per file | 16:00 |
| Keybuk | in fact, I don't have difftools installed -- did --using find its way into bzr proper? | 16:00 |
| spiv | Keybuk: since 1.1rc1 according to NEWS | 16:01 |
| === mario_ is now known as pygi | ||
| Keybuk | but it runs multiple tools for each file, rather than just one? :-( | 16:03 |
| Keybuk | ah, installing difftools makes it use just one :p | 16:09 |
| spiv | Sounds like a bug to me, but I don't use --using. | 16:10 |
| * spiv -> bed | 16:11 | |
| antoranz | Hi, Guys! | 17:54 |
| antoranz | I'm having problems installing the bzr plugin for eclipse on hardy | 17:54 |
| antoranz | can anybody help me? | 17:54 |
| antoranz | when I try to configure it, I get a line of errors on top (not the bzr-xmloutput plugin problem, though) | 17:58 |
| antoranz | http://www.pastebin.ca/1041360 | 17:59 |
| weigon | hmm, how can I fix a "RevisionNotPresent: Revision {...} not present in "revisions.kndx"." in a bzr merge ? | 19:31 |
| === rockstar_ is now known as rockstar | ||
| slangasek | lifeless: so I used cvsps to do a one-time conversion of an old CVS package repo to bzr, and afterwards someone noted that the contents of the bzr branches don't actually match what was tagged in the CVS repo... | 20:15 |
| slangasek | lifeless: halp :) | 20:17 |
| emgent | heya | 21:24 |
| bpeterson | lifeless: are you there? | 21:25 |
| Verterok | moin | 22:47 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!