| wgrant | luke-jr: You want to replay the revisions from each incompatible branch onto the canonical history, mapping file IDs. | 00:00 |
|---|---|---|
| luke-jr | that would be ugly. :/ | 00:01 |
| luke-jr | can't just sed the branch? :p | 00:01 |
| wgrant | It would be ugly. But a lot less ugly than maintaining incompatible branches or your own aliasable repository format. | 00:01 |
| wgrant | It is a one-time cost. | 00:01 |
| luke-jr | ok, how about pasting on missing history? | 00:02 |
| wgrant | What do you mean? | 00:02 |
| luke-jr | bzr-svn only got the last N revisions of the history | 00:05 |
| luke-jr | we need to restore the full history too | 00:05 |
| wgrant | Do any of the bzr branches have the full history? | 00:06 |
| luke-jr | no | 00:06 |
| luke-jr | except the prototype ones I'm making now with cvsps-import | 00:07 |
| wgrant | Why didn't bzr-svn catch it all? | 00:07 |
| luke-jr | it doesn't follow hierarchial changes | 00:07 |
| luke-jr | after moving to Subversion from CVS, we rearranged the repository structure to be nicer | 00:08 |
| wgrant | Are the old CVS and Subversion repos no longer in use? | 00:09 |
| luke-jr | the Subversion one is, but not for the branches in Bazaar right now | 00:09 |
| wgrant | Even so, that's fairly inconvenient as it means compatibility has to be maintained somehow. | 00:10 |
| luke-jr | not really | 00:10 |
| wgrant | So, what I would do: | 00:11 |
| wgrant | - Somehow get a consistent and complete copy of the history into a bzr branch. | 00:12 |
| wgrant | - Hack rebase so it maps the file IDs (as in the bug). | 00:12 |
| wgrant | - Rebase all of the branches on top of the new history. | 00:13 |
| luke-jr | can I get cvsps-import to use a file-id file? | 00:13 |
| wgrant | (or some prefix of the new history) | 00:13 |
| wgrant | I don't know. | 00:13 |
| luke-jr | can current-trunk-revision-2 be made to sit cleanly on top of a revision N? | 00:14 |
| wgrant | "current-trunk-revision-2"? | 00:15 |
| TheMusicGuy | I'm trying to get a very simple installation of bzr onto my shared web host. I don't have root access, but all I need to be able to do is list files in a repo. | 00:15 |
| TheMusicGuy | I only have FTP access to the host; no telnet, ssh, etc. | 00:16 |
| TheMusicGuy | How can I do it? | 00:16 |
| wgrant | TheMusicGuy: Why do you want bzr on there? You don't actually need bzr on the server just to host a branch. | 00:16 |
| TheMusicGuy | because webbzr needs it | 00:17 |
| TheMusicGuy | I want to be able to browse branches with a web interface | 00:17 |
| wgrant | Ah. | 00:18 |
| mathepic | Any reason you can't use LaunchPad? | 00:19 |
| TheMusicGuy | its not for a project. Its for homework. | 00:19 |
| wgrant | Trying to get a web interface like that up on a shared host with only FTP access sounds like more trouble than it's worth. | 00:20 |
| TheMusicGuy | I use bzr and my personal web host for backing up school work. | 00:20 |
| wgrant | Although it is more than likely doable. | 00:20 |
| TheMusicGuy | sorry, I didn't see your last post | 00:21 |
| TheMusicGuy | webbzr seems like it would work, but I need to have a bzr install on there somewhere | 00:21 |
| wgrant | Do you really need webbzr? | 00:21 |
| TheMusicGuy | that looked like the simplest solution. Its just three files, only one of which is actually a PHP file. Configuration is as simple as changing a few lines in the top of the script. | 00:22 |
| mathepic | For three files, I really doubt you need a web interface | 00:24 |
| mathepic | Oh | 00:24 |
| mathepic | webbzr not your project | 00:24 |
| mathepic | Nevermind, I misunderstood. | 00:24 |
| mathepic | How big is your project/homework? | 00:24 |
| TheMusicGuy | pretty big. | 00:25 |
| TheMusicGuy | Can't I just upload an install of bzr into some directory on my server and tell webbzr to use that? | 00:25 |
| TheMusicGuy | I don't need to make any changes or create any files from the web interface. | 00:26 |
| TheMusicGuy | read-only is fine. | 00:26 |
| mathepic | Where can I find the source of webbzr | 00:26 |
| TheMusicGuy | http://bazaar.enseed.com/app/webbzr/ | 00:27 |
| mathepic | Why exactly do you need a web interface anyway | 00:28 |
| TheMusicGuy | so I can access the repo from workstations that don't have bzr installed while still using bzr | 00:29 |
| RenatoSilva | btw, hg's web ui has an interesting feature, you can donwload a whole tree using a single link where you specify a revision/tag, loggerhead could have the same thing :) | 00:40 |
| RenatoSilva | I mean, the tree is packaged as .zip or so | 00:41 |
| quidnunc | Stupid question: How do I switch to the last commit with a given nick (branch?) | 00:45 |
| quidnunc | ? | 00:45 |
| loxs | is there some way to check what percentage of the code is contributed by each developer? | 00:46 |
| mathepic | I just saw that | 00:46 |
| mathepic | somewhere | 00:46 |
| mathepic | just looking around Synaptic | 00:46 |
| mathepic | This might do it | 00:46 |
| mathepic | bzr-stats | 00:46 |
| mathepic | "This is a simple plugin for Bazaar that can list the contributors to a | 00:46 |
| mathepic | branch and what they worked on." | 00:46 |
| mathepic | I don't know if it does percents though | 00:47 |
| loxs | thanks | 00:47 |
| james_w | I don't think that works by line if that is what you are looking for | 00:47 |
| james_w | though perhaps it has a mode for that | 00:47 |
| mathepic | I don't understand why Canonical never updated the bzr in the Ubuntu repository | 00:48 |
| mathepic | You have to use the bzr in the PPA for 2a (and thus LaunchPad) | 00:49 |
| wgrant | mathepic: Launchpad doesn't force you to use 2a. | 00:49 |
| wgrant | mathepic: And the bzr team can't push inappropriate updates into Ubuntu releases just because both have Canonical involvement. | 00:50 |
| wgrant | Ubuntu has a strict stable release update policy. | 00:50 |
| TheMusicGuy | Ah, nevermind. I just figured out that the filesystem layout of my host won't work for webbzr. I'll have to rework it before I can do this... | 00:52 |
| wgrant | mathepic: bzr's new (and IMO less insane) release schedule should be a bit nicer to distros. | 00:53 |
| mathepic | I just took a look at the policy | 00:54 |
| mathepic | Ugh | 00:54 |
| wgrant | It is necessary. | 00:54 |
| lifeless | wgrant: weeeel | 01:09 |
| lifeless | wgrant: it is what is | 01:09 |
| wgrant | lifeless: That much is clear. | 01:10 |
| wgrant | lifeless: (what are we talking about? the SRU policy?) | 01:11 |
| lifeless | wgrant: yes | 01:53 |
| wgrant | lifeless: I'm sure you know the disasters that have come about. | 02:05 |
| wgrant | But it is perhaps overly strict for less core components. | 02:05 |
| wgrant | Although it would be particularly foolish to ever SRU 2.0.0, because of the default format change. | 02:06 |
| lifeless | wgrant: I'd call it tricky rather than foolish | 02:15 |
| lifeless | wgrant: 'needs to be one with vare' | 02:15 |
| wgrant | lifeless: I don't want my Jaunty system to one day start creating incompatible repositories. | 02:16 |
| lifeless | it does that right now ;) | 02:17 |
| wgrant | Does it? | 02:17 |
| lifeless | yes, it will be making pack-0.92, which can't pull in a growing number of projects | 02:17 |
| lifeless | at some point the fraction will pass 50% | 02:17 |
| lifeless | but we could do 2.0.0 with a plugin for the default back, or other such techniques | 02:18 |
| wgrant | Pulling an existing branch into a new branch doesn't seem like a very common case. | 02:18 |
| lifeless | regardless, I think the concept of a 2.0.0 SRU is not foolish | 02:18 |
| lifeless | wgrant: you said repository | 02:18 |
| wgrant | lifeless: Shh. | 02:18 |
| wgrant | 2.0.0-sans-default-change would be nice, but I can't really see it happening. | 02:18 |
| lifeless | wgrant: all the upstream code imports are going to be moved to 2a | 02:19 |
| lifeless | the ubuntu branches are 2a | 02:19 |
| wgrant | I know. | 02:20 |
| jelmer | johnf: hi | 02:48 |
| luke-jr | Does anyone have the 'fileid' or 'graft' plugins mentioned at the end of http://bazaar-vcs.org/BzrPlugins ? | 05:18 |
| wgrant | luke-jr: Those links have them... | 05:37 |
| wgrant | Oh, wow, they are old. | 05:37 |
| wgrant | A weave repo! | 05:37 |
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| luke-jr | wgrant: those links are empty and "unauthorized" | 09:47 |
| wgrant | luke-jr: Not quite - try checking them out with bzr | 10:03 |
| Zand3r | Hello all... Does anyone have a URL to hand where someone has documented their usage of qbzr-eclipse? I've | 13:30 |
| mathepic | I've never even heard of qbzr-eclipse | 13:32 |
| Zand3r | mathepic: Not that you are necessarily interested but this is what I am 'trying' to use http://bazaar-vcs.org/QBzrEclipse | 13:33 |
| Zand3r | I'm evaluating bzr for our project and the Bazaar Explorer gui seems great and makes sense but we use an Eclipse based IDE for microcontroller code and I just can't see what the workflow should be between bzr and Eclipse. | 13:35 |
| mathepic | I don't use eclipse, but I get along just fine switching between my editor and the terminal | 13:36 |
| mathepic | I tried bzr-eclipse when I was using eclipse and it wasn't very good | 13:36 |
| mathepic | I just took a look at the page for qbzr-eclipse | 13:37 |
| mathepic | Scrolled down | 13:37 |
| mathepic | Found a link to this bug | 13:38 |
| mathepic | https://bugs.edge.launchpad.net/bzr-eclipse/+bug/121936 | 13:38 |
| ubottu | Ubuntu bug 121936 in bzr-eclipse "Eclipse hangs in bazaar operations that require user input" [High,Triaged] | 13:38 |
| mathepic | Yep, thats the same one I just posted | 13:38 |
| mathepic | Oh wait, that one was for bzr-eclipse | 13:38 |
| Zand3r | Yes... I had seen that which is why I opted to try qbzr-eclipse which doesn't seem to have the same issues documented (presumably because it uses the more standard qbzr gui widgets) | 13:39 |
| mathepic | I never had a problem pushing with bzr-eclipse when I used it | 13:40 |
| mathepic | It just didn't have all the commands | 13:40 |
| mathepic | And was super slow | 13:40 |
| Zand3r | My problem seems to stem from the fact that using a standard text editor I could just work with files in whatever directory (branch) I want but in Eclipse when I branch I'd have to re-import the project directory again each time which doesn;t seem like a seemless workflow. | 13:40 |
| Zand3r | Maybe its my lack of experience with VCSs in general but there seems to be a conflict between bzr which has a directory per branch and eclipse which expects a single directory per project and has no way to easily switch that project view toa different directory (branch) | 13:42 |
| mathepic | Can't you just refresh the directory in Eclipse? | 13:42 |
| mathepic | Project = Branch in general | 13:43 |
| mathepic | Do you need more than one Branch? | 13:43 |
| Zand3r | Say I have a project called 'Project' and I go to bzr explorer and create a branch called 'Project-Feature'.... bzr explorer creates a new directory for that new branch but the Eclipse project is still pointing at the original directory. | 13:44 |
| mathepic | Can Bzr Explorer turn an existing project into a branch | 13:44 |
| mathepic | I'm not sure | 13:44 |
| mathepic | I don't use it | 13:44 |
| mathepic | Go to terminal, go to the directory of the project | 13:44 |
| mathepic | And use the command "bzr init" | 13:45 |
| mathepic | It will turn your project into a branch | 13:45 |
| mathepic | Then use "bzr ignore ...." for files you want to be ignored | 13:45 |
| mathepic | then "bzr add" to add the rest | 13:45 |
| mathepic | And its set up | 13:45 |
| Zand3r | OK.. but just so I understand, if you were to then branch from that (to work on a new feature without immediately affecting the main/original branch) then what would you do? I 'think' branching will create a new directory that the Eclipse project will not be pointed to - yes? | 13:47 |
| mathepic | You probably wouldn't want two branches in the same project | 13:48 |
| mathepic | Just create a new project for the second branch | 13:48 |
| dorins | Zand3r: you could set up an eclipse workspace for a lightweight checkout and then bind that checkout to different branches using 'bzr switch' | 13:51 |
| dorins | I was considering this workflow at some point, I think | 13:52 |
| Zand3r | hmm... ahh... so I just understood what mathepic is suggesting I think.... using the terminal (or bazaar explorer) I could branch the project which would create a new directory and then import that into Eclipse as a new project, work on it.... then using the terminal (or bazaar explorer again) merge the tested changes into the original project at which time i should be able to 'refresh' the project in Eclipse which will cause it to update. | 13:53 |
| mathepic | You don't have to create a new directory to branch | 13:54 |
| mathepic | You can use the existing directory, which happens to be the directory of your project | 13:54 |
| mathepic | Oh wait | 13:54 |
| mathepic | For the first step you could either branch from anotther branch or you could use an existing local project | 13:55 |
| mathepic | Depending on whether the branch already exists somewhere | 13:55 |
| Zand3r | dorins: Thank you - not ignoring what you have suggested, am looking for details of lightweight checkouts | 13:55 |
| dorins | this might help: http://doc.bazaar-vcs.org/latest/en/user-guide/reusing_a_checkout.html | 13:55 |
| mathepic | I've never dealt with those - Is that basically having multiple branches in one directory and being able to switch between which ones you are using | 14:00 |
| mathepic | It says there are no local commits; that is a signifigant disadvantage. | 14:01 |
| Zand3r | dorins: Thanks... I will run through the lightweight checkout workflow to familiarise myself with it... it looks like it would solve the issue of working across multiple branches without having to manually import each one into Eclipse as a new project (I could just refresh the one project after switching) but as mathepic suggests there does appear to be several disadvantages associated with that approach (including the fact that I'd have to make sur | 14:05 |
| Zand3r | committed work on a branch before switching to another branch) | 14:05 |
| mathepic | It looks like it takes away the whole distributed side | 14:07 |
| dorins_ | mathepic: the branches can be local themselves, each in it's own directory. But the working tree is a lightweight checkout that you bint to any of the branches as you work on them. This way you can share a single eclipse workspace for all branches. | 14:09 |
| dorins_ | arr, wifi on linux is still causing me greef | 14:10 |
| dorins_ | s/greef/grief | 14:10 |
| === dorins_ is now known as dorins | ||
| Zand3r | ok... well I've realised that Eclipse can not import projects (branches) that are already in the Eclipse workspace so it seems that branching, etc. needs to take place outside of the Eclipse workspace in which case dorins' lightweight checkout approach might work best in the context of using Eclipse (keeping in mind that I'm [a] new to all this and [b] haven't run through and actually tried it yet) | 14:17 |
| Zand3r | Unless i'm totally misunderstanding how to use qbzr-eclipse which does add a 'branch' option to the Eclipse IDE but doesn't seem to then let me use the branch it creates. | 14:18 |
| Zand3r | Thanks for the help both of you - I do really appreciate it - I'll continue to work through this | 14:19 |
| === abentley1 is now known as abentley | ||
| === ubott2 is now known as ubottu | ||
| === SamB_XP_ is now known as SamB_XP | ||
| lifeless | moin moin | 19:10 |
| itistoday | how does the bzr-git plugin work? | 19:42 |
| itistoday | can't find any docs on it | 19:42 |
| lifeless | itistoday: do you mean 'as a user how do I use it' or 'what does the code do' ? | 19:47 |
| itistoday | lifeless: the former | 19:48 |
| itistoday | sorry for not being more specific | 19:48 |
| lifeless | have you installed it? | 19:48 |
| itistoday | yeah i think so | 19:48 |
| lifeless | itistoday: nothing to apologise for, I just want to answer the right question :) | 19:48 |
| lifeless | ok, 'bzr plugins' should list 'git' if you've installed it | 19:49 |
| itistoday | yeah it's there | 19:49 |
| lifeless | cool | 19:49 |
| lifeless | so, generally you can just give git:// or git+ssh:// urls to bzr now | 19:49 |
| itistoday | and then use bzr with it? | 19:50 |
| lifeless | there is a new command to do bulk imports from git I think, 'bzr help git' should give some info on that, or perhaps 'bzr help commands | grep git' | 19:50 |
| lifeless | itistoday: yes | 19:50 |
| lifeless | itistoday: it aims to be transparent | 19:50 |
| itistoday | hmm... will git still work? | 19:50 |
| lifeless | yes | 19:50 |
| itistoday | ah that's good to konw | 19:50 |
| itistoday | what if i've already imported something with git? | 19:51 |
| itistoday | do i have to re-check it out with bzr? | 19:51 |
| === Adys_ is now known as Adys | ||
| lifeless | itistoday: to use it with bzr? its recommended I think | 19:52 |
| lifeless | you can just cd to the git tree and run commands like 'bzr diff' 'bzr commit' etc | 19:52 |
| lifeless | but I don't think that 'bzr ignore <path>' will do the right thing yet ;) | 19:52 |
| itistoday | lifeless: thanks, i'll give it a shot, seems like i need to install dulwich, will do that now | 19:53 |
| itistoday | well neat | 19:57 |
| itistoday | it seems to work like magic | 19:57 |
| itistoday | i'm so happy i can stay in bzr land | 19:57 |
| lifeless | :) | 19:58 |
| fullermd_ | Gehm's Corollary :p | 19:58 |
| itistoday | there's a bzr-hg too :-) | 19:58 |
| itistoday | hey cool, bzr 2.0 has been released, need to get that | 19:59 |
| itistoday | how do i install dulwich, or any other plugin, and make sure that it only installs into ~/.bazaar? | 20:15 |
| itistoday | doesn't seem to be a way... at least for dulwich | 20:24 |
| LarstiQ | dulwich is more a support library than a plugin | 20:26 |
| LarstiQ | itistoday: it's a python libgit | 20:26 |
| itistoday | ah | 20:27 |
| itistoday | bzr-hg seemed to work nicely though | 20:27 |
| itistoday | guess they work differently | 20:27 |
| LarstiQ | hg itself is written in python, no need to write an implementation/wrappers for it :) | 20:31 |
| LarstiQ | itistoday: you'll note that bzr-svn uses subvertpy which wraps libsvn | 20:32 |
| itistoday | LarstiQ: ah gotcha | 20:32 |
| itistoday | wonder what came first, hg or bzr | 20:33 |
| itistoday | they're pretty similar | 20:33 |
| itistoday | think the hg guys should just team up with bzr ;-) | 20:33 |
| itistoday | too many vcs' give developers headaches | 20:33 |
| fullermd_ | That's on the schedule for right after the X radeon and radeonhd drivers merge, and MySQL and Postgres combine efforts. | 20:34 |
| itistoday | hehe | 20:34 |
| lifeless | itistoday: bzr came first | 20:51 |
| mathepic | Hg started when that one guy stopped giving free BitKeeper licenses to Linux Kernel devs, right? | 20:54 |
| mathepic | I have no idea when Bazaar started though | 20:54 |
| itistoday | lifeless: thanks | 20:59 |
| lifeless | mathepic: thats when git started; hg started a little earlier than that | 20:59 |
| mathepic | I thought they both started in response to it | 21:00 |
| mathepic | Where is your source? I can't find a "reliable" one | 21:02 |
| lifeless | my memory :) | 21:02 |
| mathepic | Go fix Wikipedia then :) | 21:03 |
| lifeless | mpm - the hg author - is the guy to ask | 21:06 |
| lifeless | I *thought* he started sketching stuff out back in feb that year | 21:06 |
| RenatoSilva | Someone said here that diff 2.0 2.1 > 1.18 2.0, so what's so new in 2.0 to not justify a 1.19? | 21:11 |
| lifeless | RenatoSilva: the default format has changed | 21:15 |
| lifeless | this is a very user visible alteration that we want to make sure people are aware of and take the time to upgrade properly; major releases signal such things | 21:16 |
| RenatoSilva | if I upgrade to 2.0, will the old branches be converted automatically? | 21:17 |
| mathepic | No | 21:17 |
| mathepic | bzr upgrade | 21:17 |
| RenatoSilva | mathepic: does it work fine? or have you been receiving some trouble reports? | 21:18 |
| mathepic | I didn't have to | 21:18 |
| mathepic | run bzr upgrade | 21:18 |
| mathepic | then bzr check | 21:18 |
| lifeless | RenatoSilva: what are you really asking | 21:19 |
| RenatoSilva | lifeless: if upgrading to the new format using bzr upgrage will always work fine | 21:24 |
| lifeless | RenatoSilva: you should read the upgrade guide | 21:24 |
| RenatoSilva | ok it's not trivial then, I'll google for that, thanks | 21:24 |
| lifeless | RenatoSilva: it often is. sometimes its not. | 21:27 |
| RenatoSilva | ok | 21:27 |
| itistoday | is there a way that i can check whether two branches are different? | 21:37 |
| Peng_ | itistoday: "bzr missing"? | 21:39 |
| itistoday | Peng_: thanks, that worked | 21:44 |
| itistoday | is there anything special i should do to remove a branch? | 21:45 |
| itistoday | or will just rm'ing it work fine? | 21:45 |
| itistoday | (it's part of a shared repo) | 21:45 |
| === khmarbaise_ is now known as khmarbaise | ||
| Peng_ | itistoday: Just rm it. If the branch had any unique revisions, they'll still be in the repo, but it's not worth the effort of removing them. | 21:59 |
| Peng_ | Unless you, like, added an ISO. | 21:59 |
| itistoday | Peng_: thanks | 22:24 |
| === spm` is now known as spm | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!