| === abentley1 is now known as abentley | ||
| methods | after i init a new repo can i make the files visible so as to expose it via http ? | 03:08 |
|---|---|---|
| RAOF | methods: Once you've committed a revision containing “the files" (whatever they may be) to the branch, they'll be visible over http (assuming the branch is already visible over http). | 03:10 |
| methods | http://fly.thruhere.net/projects/fskn_ruby/ | 03:11 |
| methods | i don't see any files | 03:11 |
| === davidstrauss_ is now known as davidstrauss | ||
| methods | what's the proper way to setup bzr+ssh ? | 03:23 |
| bob2 | methods: so, you pushed over bzr+ssh or sftp, right? | 03:33 |
| bob2 | they doesn't update the remote working copy (ie the checked out files) | 03:33 |
| bob2 | there's an 'update after push' plugin that does that | 03:34 |
| === Sam__ is now known as SamB_XP | ||
| Noldorin | hi | 13:40 |
| Noldorin | i'm getting the following error when i try to push to LP: | 13:40 |
| Noldorin | Permission denied (publickey). | 13:40 |
| Noldorin | bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist. | 13:40 |
| Noldorin | seems to be a problem with pageant and the SSH key not being recognised | 13:40 |
| Noldorin | anyone? | 13:46 |
| === menesis1 is now known as menesis | ||
| Noldorin | <Noldorin>i'm getting the following error when i try to push to LP: | 15:23 |
| Noldorin | <Noldorin>Permission denied (publickey). | 15:23 |
| Noldorin | <Noldorin>bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist. | 15:23 |
| Noldorin | <Noldorin>seems to be a problem with pageant and the SSH key not being recognised | 15:23 |
| * maxb doesn't do Windows | 15:25 | |
| Noldorin | heh, that's the most typical reply i've had so far. | 15:25 |
| jelmer_ | Noldorin: looks like your ssh key on launchpad can not be found ? | 15:48 |
| jelmer_ | Noldorin: did you add any keys on launchpad ? | 15:48 |
| Noldorin | jelmer_: yeah, i've had one on there for a while and it's always worked | 15:48 |
| Noldorin | i tried reuploading it after the problems too | 15:48 |
| Noldorin | jelmer_: https://launchpad.net/~noldorin | 15:48 |
| Noldorin | i use Pageant to provide the key, so i'm wondering if bzr isn't communicating with pageant properly... | 15:50 |
| maxb | Noldorin: Were you on Linux, I'd recommend trying 'ssh bazaar.launchpad.net' just to test the connection. Perhaps you can do something similar? | 15:53 |
| Noldorin | maxb: cygwin perhaps? | 15:54 |
| Noldorin | maxb: yeah, same result | 15:56 |
| Noldorin | Permission denied (publickey) | 15:56 |
| Noldorin | hmm... | 15:56 |
| Noldorin | i wonder if that could be because it's using OpenSSH rather than putty's implementation | 15:56 |
| Wellark[] | sigh.. I'm trying to find out how to fix the problem with updating missing signatures to remote repository.. | 16:02 |
| Wellark[] | no luck yet :/ | 16:03 |
| Wellark[] | probably need to add some command like 'sync-signatures' | 16:05 |
| Wellark[] | don't know yet | 16:06 |
| Wellark[] | the first thing to figure out is how to get new signatures from sign-my-commits to remote repository | 16:15 |
| Noldorin | maxb: solved. turned out the problem was habing cygwin in my path :P | 16:19 |
| LaserJock | anybody know of any possible way to make multi-pull give more info? or alternatively how to do recursive bzr pulls with some actual change info? | 16:44 |
| * maxb uses a shellscript | 16:54 | |
| jelmer_ | wellark[]: I'd recommend writing to the list about this | 16:56 |
| jelmer_ | wellark[]: I think push should be propagating new signatures | 16:56 |
| LaserJock | maxb: for *every* branch? | 16:56 |
| LaserJock | it seems like something that would be quite common to do, for instance, "pull from all branches in this repo" | 16:57 |
| maxb | Well, I use multi-pull too, it varies | 16:59 |
| jelmer_ | LaserJock: I also have a shell script that basically does "for I in src/*/*; do bzr pull -d $I; done" | 16:59 |
| maxb | I find multi-pull malfunctions trying to pull Launchpad | 17:00 |
| maxb | I need to get around to debugging that | 17:00 |
| LaserJock | multi-pull is good, but it gives like no info at all | 17:01 |
| LaserJock | so most often I don't really know if a branch has changed or not | 17:01 |
| LaserJock | so I end up running multi-pull and then going to individual branches I care about and do a bzr lesslog to see what actually changed | 17:02 |
| LaserJock | which seems a little suboptimal to me :-) | 17:02 |
| LaserJock | is there any way to get bzr to do a diffstat-like output for a log or pull like how git does when you run git-pull? | 17:16 |
| gutworth | bzr pull -v | 17:16 |
| gutworth | oh, no | 17:17 |
| Wellark[] | jelmer_: sure., I'll write to the list when I have the time | 17:33 |
| njn | Does Bazaar work on Mac? | 18:14 |
| jelmer_ | njn: yep | 18:15 |
| eydaimon | how do I unadd a file I added by accident? | 18:39 |
| eydaimon | nm | 18:40 |
| eydaimon | bzr rm --keep | 18:40 |
| kfogel | no way to edit a commit message long after it's been published in bzr, right? (since changes are replicated all around, this would be even conceptually very difficult) | 19:15 |
| gutworth | right | 19:20 |
| gutworth | unless you uncommit, but that's a bit icky | 19:20 |
| kfogel | gutworth: thank you (yeah, I know about the uncommit case, but it's of limited use for the scenarios I'm thinking of) | 19:23 |
| Colonel-Rosa | morning | 19:35 |
| Colonel-Rosa | Are bzr branches to those like as seen in git? For example, could I do : bzr push ssh://blah unstable? | 19:36 |
| gutworth | no, bzr branches aren't colocated | 19:36 |
| Colonel-Rosa | Ok, so they act as seperate repositories? | 19:37 |
| gutworth | sort of | 19:37 |
| gutworth | you can have multiple branches in the same repo | 19:37 |
| Colonel-Rosa | hmm | 19:42 |
| maxb | Colonel-Rosa: Unlike git, in bzr, both branches and repositories exist in the filesystem rather than purely in the vcs's ui | 19:51 |
| maxb | e.g. foo/ could be a bzr repo, and foo/bar/, foo/baz/ and foo/quux/ could be three branches in that repository | 19:52 |
| maxb | On the other hand, bzr also allows the situation where a single branch is colocated with its repository | 19:53 |
| Colonel-Rosa | Right, I was planning to have a stable and unstable branch of my website code. I wasn't using a shared repository before | 19:54 |
| NfNitLoop | it's easy to change. | 19:54 |
| NfNitLoop | create a repository, then branch into it. | 19:54 |
| NfNitLoop | any other branches you create in there will share the repository. | 19:54 |
| maxb | Don't even need to branch into it | 20:09 |
| Colonel-Rosa | I think I'm being a bit confusing, sorry. | 20:10 |
| Colonel-Rosa | I'll try and draw a diagram | 20:11 |
| maxb | To convert a branch which is currently standalone to be using a shared repository, 'bzr reconfigure --use-shared' | 20:11 |
| NfNitLoop | maxb: aah. but then you have a branch checked out into the root of a shared repository? | 20:12 |
| maxb | NfNitLoop: No, that's impossible | 20:12 |
| maxb | (or at least, I think it is) | 20:13 |
| maxb | 'bzr reconfigure --use-shared' requires that a shared repository exists *above* the branch | 20:13 |
| NfNitLoop | Oh, I managed to do it by pushing to that location once. | 20:13 |
| NfNitLoop | maxb: aah. | 20:13 |
| Colonel-Rosa | Explanation : I have 2 website locations, a "production" and a "staging". My problem arrose when I found a critical bug, but I had already pushed some new features to the repository, obviously I didn't to push out those new features so I was stuck. I'm using Capistrano to pull the code from the repo btw | 20:16 |
| Colonel-Rosa | Does that make sense? | 20:17 |
| jelmer | hi maxb, NfNitLoop | 20:17 |
| maxb | Yes, other than I don't know what Capistrano is | 20:17 |
| Colonel-Rosa | maxb, it's a website deployment system, it just pulls out code from a specified repository | 20:17 |
| NfNitLoop | Colonel-Rosa: So what I would do in this case... is create a new branch based on your current production. | 20:18 |
| NfNitLoop | fix the bug on that branch. | 20:18 |
| luks | Colonel-Rosa: the only sane solution is to use multiple branches | 20:18 |
| NfNitLoop | test it. | 20:18 |
| luks | one for production, one for staging | 20:18 |
| NfNitLoop | if it works, merge it into production and staging. | 20:18 |
| NfNitLoop | then throw away the branch. | 20:18 |
| maxb | Colonel-Rosa: So, 'staging' is a fairly permanent thing, of which there is exactly one? (Rather than something you can just start up extra instances on demand, using different code?) | 20:20 |
| Colonel-Rosa | correct | 20:21 |
| maxb | If so, I think you should have permanent "production" and "staging" branches which are your Capistrano deploy targets, and an arbitrary and variable number of extra branches for development not yet deployed | 20:21 |
| Colonel-Rosa | ok, I'll give it a try | 20:24 |
| Colonel-Rosa | thank you | 20:24 |
| Colonel-Rosa | maxb, NfNitLoop http://i.imgur.com/pn2qw.png | 20:43 |
| Colonel-Rosa | Is that right? | 20:44 |
| whitley | hi all. happy new year! initial version of ignore exclusions and tests for same at lp:~whitley/bzr/ignore-exclusion | 21:33 |
| whitley | I still need to update the the help, add one test I just thought of, and review for any edge-cases or unintended side-effects. Still, getting close. | 21:33 |
| jelmer | hey whitley | 21:34 |
| jelmer | whitley,: what does that branch do exactly? | 21:34 |
| whitley | Implements an extension to the .bzrignore syntax. Patterns prefixed with an exclamation point (!) have priority and are NOT ignored. | 21:35 |
| whitley | This is very useful for cases such as versioning one's home directory, /etc, and so forth, where most files are ignored, but some selected paths/files are versioned. | 21:36 |
| whitley | see also bug 428031 | 21:36 |
| ubottu | Launchpad bug 428031 in bzr ".bzrignore should support exclusions" [Medium,Confirmed] https://launchpad.net/bugs/428031 | 21:36 |
| whitley | bug updated with current status. later all! | 21:46 |
| === khmarbaise_ is now known as khmarbaise | ||
| Jordan_U | Every command I run with bzr outputs 'No handlers could be found for logger "bzr"'. | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
