| === Vorpal is now known as Vorpal_ | ||
| === Vorpal_ is now known as Vorpal | ||
| === r0bby_ is now known as robbyoconnor | ||
| === zyga-afk is now known as zyga | ||
| zyga | hi, is there a way to rebase a tree on top of nothing, just to change all the internal file IDs | 07:25 |
|---|---|---|
| * gour is, in principle, against rebase, but well... | 07:26 | |
| zyga | gour, I'm trying to work around a bug in bzr | 07:29 |
| zyga | gour, that prevents me to bzr join two trees that have some common ancestry | 07:29 |
| gour | zyga: ahh, ok...good luck | 07:29 |
| === r0bby is now known as robbyoconnor | ||
| gour | we're considering to keep our /etc under bzr, possibly with etckeeper...anyone using it (possibly on archlinux)? | 07:52 |
| bob2 | definitely need etckeeper | 07:56 |
| bob2 | works quite well with git for me | 07:56 |
| gour | the point is that, afaik, there is no support for archlinux's pacman, so wonder if it is worth without it? | 08:00 |
| bob2 | yes | 08:01 |
| bob2 | and integrating it should be trivial assuming pacman isn't totally crap and has no hook support at all | 08:01 |
| gour | heh | 08:03 |
| gour | i'd use it with bzr (treeless repo and lightweight checkout) | 08:04 |
| bob2 | erk | 08:07 |
| mgz | morning | 08:23 |
| === yofel_ is now known as yofel | ||
| mgz | is there a shorter equivalent of -c rev in git than SHA^..SHA? | 11:29 |
| LeoNerd | I'm not aware of one. It's one of my standard ways to wind up the git fans :) | 11:45 |
| LeoNerd | Especially bzr di -c-1 | 11:45 |
| * gour considers that git is simply not human...that's all | 12:30 | |
| gour | i'm considering one linux distro which uses git for contribution and wonder if bzr-git can be used...the answer is "yes...as long as the output is a patch that can be read by 'git am'". are we on the right track with bzr-git here? | 13:03 |
| jelmer | gour: sort of | 13:07 |
| jelmer | gour: bzr-git adds custom formatters to 'bzr send' and 'bzr diff' | 13:07 |
| * gour is confused a bit | 13:07 | |
| jelmer | gour: 'bzr send --formt=git' will attempt to generate 'git am' compatible patches | 13:07 |
| gour | jelmer: ohh, that's good :-) | 13:07 |
| jelmer | gour: in practice, there's still some issues with that though | 13:08 |
| gour | jelmer: may we count on bugging you about in stumbling upon some obstacles? | 13:09 |
| gour | *it when stumbling... | 13:09 |
| kbulgrien | heh, can they count on you for patches? | 13:10 |
| kbulgrien | :-) | 13:10 |
| gour | he he | 13:11 |
| jelmer | gour: I'm happy to comment or review changes | 13:11 |
| * kbulgrien avoids git like the plague | 13:11 | |
| gour | they just have their policy and we are anticipating need to contribute some missing packages (without being involved with git) | 13:12 |
| jelmer | gour: but I'm not really doing a lot of activce work on this code anymore | 13:12 |
| gour | jelmer: so, if git changes something in the future, there js de | 13:12 |
| gour | *is dead-end? | 13:12 |
| jelmer | gour: even before then, there may be minor issues that you will want to see fixed | 13:13 |
| jelmer | i.e. it generating output that is not compatible with git-am in some situations | 13:14 |
| jelmer | (I don't know if it does, but I can imagine there are some situations where that is the case) | 13:14 |
| gour | ok, we'll (re-)consider it | 13:14 |
| gour | jelmer: how does plain patch differs from what 'git am' requires? i assume that's always possible to produce | 13:15 |
| jelmer | gour: git am has metadata for the commit, and e.g. a diffstat | 13:15 |
| jelmer | so things like th ecommit message, committer name, author, etc | 13:16 |
| gour | ahh, ok | 13:16 |
| jelmer | gour: don't get me wrong, I still use bzr-git (mostly with dpush) and do the occasional fix to it when I hit a bug or there's a severe regression | 13:17 |
| jelmer | gour: but I'm not working on it as actively asI was before, and don't want to give you the impression I am | 13:18 |
| gour | jelmer: ok. let me try installing taht distro 1st... | 13:18 |
| * gour appreciates jelmer's honesty | 13:18 | |
| jelmer | which distro is it, out of curiosity? | 13:18 |
| gour | frugalware...i use archlinux atm | 13:19 |
| jelmer | ah | 13:21 |
| === zyga is now known as zyga-food | ||
| === zyga-food is now known as zyga | ||
| === LyraaOptimHome is now known as jazon | ||
| jazon | Hello I have a little problem with bzr, I pastebin it | 15:11 |
| jazon | http://pastebin.com/63NXhvjE | 15:12 |
| jazon | can you help me please? | 15:13 |
| vila | jazon: try 'ssh -vv jazon@192.168.1.228' | 15:15 |
| mgz | jazon: and I'm guessing there's no directory /optimhome/portugal/ on that server | 15:15 |
| jazon | it's work | 15:15 |
| mgz | the path is not relative to your home dir, it's absolute. | 15:16 |
| === zyga is now known as zyga-afk | ||
| jazon | when I try bzr with http://my.IP.adress/optimhome/portugal it's work... | 15:18 |
| mgz | right, because the http server does it's own url->path mapping that works differently | 15:19 |
| mgz | and is relative to a srv directory presuambly | 15:20 |
| mgz | pass the full path to ssh and it should be fine (if you enter your password correctly) | 15:20 |
| jazon | what is the way to pass the full path? I don't know. | 15:23 |
| jazon | It's the first time I do my own bzr server | 15:23 |
| mgz | if you ssh into the server, where is the optimhome directory located? | 15:24 |
| mgz | under /var/www maybe? | 15:25 |
| jazon | yes | 15:25 |
| mgz | then use bzr+ssh://192.168.1.228/var/www/optimhome/portugal/ as the branch location | 15:26 |
| === youlysse` is now known as youlysses | ||
| jazon | http://pastebin.com/Kwq9vYNm | 15:34 |
| mgz | fix the permissions so your user has write access to all of /var/www/optimhome | 15:36 |
| jazon | thx mgz it's work fine :) | 15:41 |
| mgz | jazon: great! | 15:44 |
| === deryck is now known as deryck[lunch] | ||
| === r0bby is now known as robbyoconnor | ||
| === deryck[lunch] is now known as deryck | ||
| === gour1 is now known as gour | ||
| ramsforums | hello | 23:10 |
| ramsforums | anyone there | 23:11 |
| ramsforums | i need a help with bzr | 23:11 |
| wgz | it's generally best to just ask your question, rather than asking to ask. | 23:12 |
| ramsforums | Thanks | 23:15 |
| ramsforums | I have downloaded repositories on my development PC from launch pad using the following command | 23:15 |
| ramsforums | bzr branch lp:openobject-server/6.1 server | 23:15 |
| ramsforums | It worked and all latest source files on my PC | 23:15 |
| ramsforums | Last week I did an merge using the following command | 23:15 |
| ramsforums | bzr merge | 23:15 |
| ramsforums | It worked well. | 23:15 |
| ramsforums | I am not making any changes to my working code. I typically use them that's all | 23:15 |
| ramsforums | Today I want to get the all latest changes from the repository I run the following command | 23:15 |
| ramsforums | bzr merge | 23:15 |
| ramsforums | I have encountered the following err | 23:15 |
| ramsforums | bzr: ERROR: Working tree [Actual tree here ] has uncommitted changes (See bzr status) | 23:15 |
| ramsforums | Is it a buy or I am making mistake? | 23:15 |
| ramsforums | Thank you | 23:16 |
| wgz | you want to use `bzr pull` not `bzr merge` to just get the latest changes | 23:16 |
| ramsforums | oo ok thanks | 23:16 |
| ramsforums | appreciate your help | 23:17 |
| wgz | merge is only for the case where you have two diverged branches with a common ancestor that you want to recombine into one | 23:17 |
| ramsforums | what does bzr update do? | 23:17 |
| wgz | modifies the files in the branch and the revision that the branch stands at | 23:19 |
| wgz | see <http://doc.bazaar.canonical.com/beta/en/user-guide/core_concepts.html> | 23:19 |
| ramsforums | ok thanks wgz for the help and giving direction | 23:20 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!