| === medberry is now known as med_out | ||
| === psynaptic is now known as psynaptic|away | ||
| === psynaptic|away is now known as psynaptic | ||
| === tbasilio is now known as sili | ||
| sili | hi. how can I show a diff between two branches in terms of commits, not code? | 01:30 |
|---|---|---|
| === psynaptic is now known as psynaptic|away | ||
| === psynaptic|away is now known as afk_ | ||
| === afk_ is now known as psynaptic|afk | ||
| james_w | sili, try bzr missing in one branch, pointing to the other | 01:31 |
| === psynaptic|afk is now known as psynaptic | ||
| === psynaptic is now known as psynaptic|food | ||
| === psynaptic|food is now known as psynaptic|lunch | ||
| === psynaptic|lunch is now known as psynaptic | ||
| Kamping_Kaiser | first of all, i found a bug in the bzr shipped in squeeze :( | 04:42 |
| Kamping_Kaiser | second, curse you for having fixed it in head already :p | 04:42 |
| Kamping_Kaiser | thanks all \o/ | 04:42 |
| === psynaptic is now known as psynaptic|away | ||
| poolie | :) | 05:30 |
| === TuxIce is now known as Guest9195 | ||
| maxb | wgrant: Hello back | 07:00 |
| poolie | hi maxb, and goodbye | 07:01 |
| wgrant | maxb: Hi. You seem to do all the ~bzr PPA uploads... could you please upload loggerhead 1.18.1? | 07:02 |
| maxb | sure | 07:04 |
| wgrant | maxb: Thanks. | 07:05 |
| === Merwin_ is now known as Merwin | ||
| magcius | maxb, thanks so much | 11:20 |
| === psynaptic|away is now known as psynaptic | ||
| Stavros | hello | 16:19 |
| Stavros | is there a way to export one of my repos as a git repo? | 16:19 |
| jelmer | hi Stavros | 16:19 |
| Stavros | oh hey jelmer | 16:20 |
| jelmer | Stavros: you can use "bzr dpush --no-rebase" from the bzr-git plugin to create a git repo | 16:20 |
| Stavros | jelmer: does it work with file://? | 16:20 |
| Stavros | or do i have to push over ssh? | 16:20 |
| jelmer | Stavros: locally should work | 16:20 |
| jelmer | you can only push to an existing git branch at the moment | 16:20 |
| Stavros | hmm, i can't get it to recognise the syntax, can you give me an example? | 16:20 |
| Stavros | oh, i don't have a branch | 16:20 |
| Stavros | should i do git init and push there? | 16:20 |
| jelmer | Stavros: yeah, that should work | 16:21 |
| Stavros | i'm doing git:///tmp/myrepo/ and it says connection refused :/ | 16:21 |
| Stavros | oh, pushing to ssh worked, thank you | 16:22 |
| Stavros | hmm no, i can't reset | 16:23 |
| Stavros | aw :/ | 16:23 |
| jelmer | reset? | 16:25 |
| jelmer | you should just specify the local location of the git repository, git:// is a remote protocol that requires a separate git server to run | 16:25 |
| Stavros | oh | 16:26 |
| Stavros | hmm, if i specify bzr dpush /tml/myrepo/ --no-rebase" | 16:27 |
| Stavros | then it says /tmp/myrepo/ isn't a repo (which it isn't, because it's not a git repo) | 16:28 |
| Stavros | err, it's not a bzr repo, it's a git repo | 16:29 |
| Stavros | bah | 16:29 |
| jelmer | re | 16:37 |
| jelmer | Stavros: how did you create the thing in /tmp/myrepo ? | 16:37 |
| Stavros | mkdir /tmp/myrepo/; cd /tmp/myrepo/; git init | 16:38 |
| jelmer | Stavros: that just creates a new repository, not a new branch | 16:38 |
| Stavros | oh | 16:39 |
| Stavros | hmm, how do i create a new branch? i'm not very good with git | 16:39 |
| jelmer | Stavros: one way is "bzr init", I'm not sure how to do it using native git tools | 16:41 |
| Stavros | hmm, wait, i already have a bzr repo and want to convert it to git | 16:41 |
| Stavros | bzr init will just create a new bzr repo | 16:42 |
| jelmer | no, it'll use the existing repo if one is present | 16:45 |
| jelmer | I realize it's a bit weird | 16:45 |
| Stavros | oh | 16:45 |
| Stavros | ah yes | 16:45 |
| Stavros | it said format: git | 16:45 |
| jelmer | "bzr init-repo" creates a new repository, "bzr init" creates a branch | 16:45 |
| jelmer | whereas "git init" creates a repository | 16:45 |
| Stavros | ah, i see | 16:46 |
| Stavros | that seems to have worked, thank you very much! | 16:46 |
| jelmer | np | 16:47 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!