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