[08:20] Hi, do you know how I can bzr update update but only 1 commit ? [08:20] I don't want to take all the new commits, juste one [08:23] perhaps you want to cherrypick instead then [08:26] If you only want the *first* revision, update takes an -r argument. [08:27] First *new* revision, that is. [11:12] * jelmer waves === yofel_ is now known as yofel [15:48] hello, i'm still unable to find the right folder and bazzar structure to handle my workspace. Is anybody here able to give 5 minutes please ? [15:49] sure [15:50] ok, i make a short descrption of it [15:55] i have a website cms that has modules. A module can have file in multpiple folder in the root of the cms, f.ex. /modules/modulesname, /themes/templates/modulesname, where the cms itself also has folders in these. A customer website now owns all files from the CMS plus the modules i need. how do i make things that i can make changes to a module that i can update within a customer site without having to branch the module developement from the core CMS branch ? [15:56] sorry my english is bad, hope the question is clear [15:57] i'm reading tutorials and other blogs to understand, tested a lot the past days but still no way to get what i'm expting [15:58] uhh [15:58] not sure what you are asking :< [15:58] hmmm [15:59] why not just have one branch for...everything? [16:00] because a nay point i'd like to have a folder with only the files related to a specific module [16:01] at any point [16:01] i mean a branch can have multiple folders under it... [16:02] You mean to have a root folder witch /cmscore and /mymodule ? [16:03] you can do whatever you want honestly [16:03] bazaar tracks folders [16:05] assuming this, i'll have /cmscore/modules/, cmscore/themes on one hand, and /mymodule/modules/mymodule, /myodule/themes/templates/mymodule on the other. [16:05] Now i'd like to release this to the server, both subfolders (cmscore/* and mymodule/*) have to be murged, and this is the point i stuck [16:06] i mean, if they are both in the same branch, it will merge them fine [16:07] i think you are talking about using different branches for stuff when you only need one [16:07] hmmm [16:08] just have one branch [16:08] everything under it [16:08] and then merge it on the server when you update it [16:08] so suppose i have multiple module in my branch, how do i make a correct revisionning of each of the modules ? [16:08] bazaar does that for you [16:09] it knows what revision each file is at :> [16:10] ok, at this point i'll have to test again, thank you for your time. [16:10] in other words i madethings more complex they need to be ? [16:10] i think so =P [16:17] to track the various release can i also make local merges for a given release ? [16:22] you can use tags to help track stuff [16:22] but yeah you can do local merges and stuff [16:22] bzr is flexible [16:54] me again, the way AuroraBorealis suggested me to go did not solve my problem. here (http://pastebin.com/Zc0mwP4E) a better (graphical) description of it, anyone can give me a hint ? [18:17] bzr: ERROR: ":branch" is not a valid location alias. [18:17] ^-- any way I can obtain a list of what -is- valid? I'm just about ready to give up guessing blindly [18:19] Ahhh.. :bound [18:19] also, bzr help location-alias answers my immediate question, FTR [19:27] no chance to solve my problem http://pastebin.com/Zc0mwP4E, still nobody to put me on the right way ? [20:13] grrr, i'll give up soon, wether my noobish approach (yes i'm new to VCS) or the functionnality itself does not allow tha task i want to. netherless i'm sure what i want is not so extraordinary [20:14] it's not because i did not tried, i spent the last days with reading the net, testing, but no way [20:30] LeoNerd: yep, location-alias is indeed the right place [23:01] squib squab squob [23:17] mgz! [23:17] * jelmer is implementing nested trees [23:18] mgz: how was your christmas? [23:21] Well, apparently he had a pigeon with a little firecracker in it... [23:27] jelmer sounds like he was inspired by staring at a decorated fur for days [23:28] * mgz has had a nice few days of doing not much, apart from looking after sis's baby a bit [23:52] mgz: Ah, good