=== mario__ is now known as pygi
luke-jrbzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.03:00
luke-jrHow can I resolve this?03:00
jelmerluke-jr: well, you can't really resolve that but you can force bzr to merge anyway by using "bzr merge -r0..-1"03:01
luke-jrjelmer: will that copy the metadata?03:01
luke-jrjelmer: my target branch is empty03:01
luke-jra simple Svn repo with a single commit creating trunk, branches, and tags03:01
jelmerluke-jr: if your target branch is empty, why would you merge rather than pull?03:02
luke-jrpull doesn't work either03:02
luke-jrbzr: ERROR: These branches have diverged. Use the merge command to reconcile them.03:02
jelmerluke-jr: what do you have locally?03:03
luke-jreverything ☺03:04
jelmerluke-jr: I mean, what repository format?03:04
luke-jrorigin is CVS and Subversion03:04
luke-jrI uses the cvsps thing to turn CVS into Bazaar03:04
luke-jrnow I need to put the Subversion revisions on top of that03:04
jelmerluke-jr: that's not likely to going to work as the file ids will be different03:05
luke-jrI can delete the Subversion repository once complete. I think.03:05
jelmerso merging will result in a lot of conflicts as bzr thinks there are two different files with the same name03:05
luke-jrwell, that's why I'm going from Bazaar to Subversion first03:05
luke-jrso Bazaar can set up its revprops03:05
luke-jrand then loading the svndump should just commit the Svn repo's changes to existing files03:06
jelmerluke-jr: so, creating an empty "trunk" directory in svn is the first commit in that branch03:07
jelmerand that branch obviously doesn't share any history with the bzr branch you're trying to merge03:07
luke-jrthe only commit in the new dummy Subversion repository03:07
luke-jrI'm trying to take the bzr branch's history to Subversion03:07
jelmerluke-jr: what you *can* do is push the entire branch from bazaar into svn03:07
jelmerluke-jr: but to be able to do that /trunk shouldn't exist yet03:08
luke-jrwhat is it going to push into? O.03:08
jelmerluke-jr: and you can then run 'bzr svn-push <repo-url>/trunk' from the bzr branch03:08
jelmerthat will create the svn branch and push all contents03:08
luke-jrwill it create branches and tags too?03:09
luke-jrthe dirs03:09
jelmerluke-jr: it will create those if it needs them but they can exist03:09
luke-jrjelmer: btw, will I have trouble when I need to merge upstream CVS commits?03:13
jelmerluke-jr: no, you'll be able to keep merging from the branch imported with cvsps03:14
luke-jrjelmer: is it possible to backdate commits?03:20
luke-jr(I'm turning patches into branches)03:20
jelmerluke-jr: It's theoretically possible, but I don't think bzr allows anything like that on the command-line03:26
luke-jrany other metadata I might want to manipulate?03:26
jelmer--author perhaps03:28
luke-jr--author plus libfaketime ;)03:29
luke-jrtimestamp: Sun 194065-07-12 23:15:44 -050003:30
luke-jrthat didn't work :o03:30
jelmerwhoa :-)03:32
luke-jroh well03:32
luke-jrI'll just declare it the commit time instead of change time03:32
vinc456i'm a little confused about the docs. says "* Talk to us in irc://irc.ubuntu.com/bzr"03:38
vinc456i tried to connect and it seemed to lead to here03:38
luke-jrvinc456: what's to be confused about?03:38
luke-jrthis is #bzr03:38
vinc456isn't this freenode?03:38
vinc456is this the "official" channel?03:39
jelmervinc456: irc.ubuntu.com points at freenode03:39
jelmervinc456: yep, this is the official channel03:39
ezyangHello all, I'd like to check out all of the branches of a repos that I checkout one branch of. Is there an easy way of doing this?03:41
ivanI pulled someone's trunk into my no-working-copy branch03:51
ivanbzr said a lot of things conflict because it expected files to be there03:51
ivanhow do I escape from this mess? :)03:51
jelmerivan: bzr won't create conflicts if there is no working tree03:53
jelmerivan: can you expand a bit as to what's happening?03:54
ivanI think what might be the problem is that I manually removed the working trees03:54
jelmerah, not using 'bzr remove-tree' ?03:54
ivanI touched a file somewhere to convince bzr not to create working copies any more03:54
ivanbut perhaps that was not enough to switch to no-trees03:55
ivanjelmer: yeah :(03:55
jelmerivan: you can just remove those files manually again (everything except .bzr) and then run 'bzr remove-tree'03:55
luke-jrI can't find version 1 of a patch03:58
luke-jrcan I commit version 2 and edit the history later? ;)03:58
ivanjelmer: thanks, my branches are back to normal04:02
ivantook me a few minutes to figure out that I should be doing merge ../trunk instead of merge trunk, though04:02
Peng_bzrtools's clean-tree command makes it easier to delete all of hte unnecessary files.04:07
Peng_(See the help, though.)04:07
ivani'm trying to figure out how to recreate the tree so that I can remove-tree04:11
ivanI have uncommitted changes involving all the files being gone04:11
ivanthis is just a problem in the branch, not in the checkouts04:11
jelmerivan: try 'bzr revert'04:12
ivanjelmer: thanks again, life is good now04:12
=== bob2 is now known as Guest49913
=== bob2 is now known as Guest14785
=== Guest14785 is now known as bob2
meoblast001how do you delete a bazaar branch06:31
Peng_meoblast001: rm -rf06:35
Peng_meoblast001: If you're using a shared repo, it's not trivial to remove the now-unnecessary revisions from it. Most of us just live with the couple MB of wasted disk space.06:36
Peng_It probably wouldn't be hard to write a "gc" plugin though.06:36
meoblast001how do i remove a branch from a proejct06:37
Peng_backz: Hello06:37
Peng_meoblast001: Eh? On Launchpad?06:37
backzI'm using bzr for a private project, I need to share this repo with team, need I pay some host service with shell in order to give write-access to this repo to all my team remotely?06:37
meoblast001Peng_: yues06:37
Peng_meoblast001: There's a little X button next to the branch's title on its web page.06:38
Peng_backz: All you really need is SFTP (or, god forbid, FTP).06:38
meoblast001https://code.launchpad.net/amethyst-mm where?06:39
Peng_meoblast001: Click on the branch.06:39
backzI've looking for services like github, but it's only for git. Lauchpad is only for open source apps.06:40
Peng_I don't know of any. :\06:41
backzis bzr slow to transfer data by sftp ?06:42
backzin the first edition, it was.06:42
Peng_backz: Well, it's certainly not as fast as the smart server, especially after all the recent work on improving the smart server's performance.06:44
meoblast001Peng_: i'm lost06:44
meoblast001i don't see an x https://code.launchpad.net/~tedks/amethyst-mm/devel06:45
Peng_meoblast001: You own that branch?06:45
meoblast001it just got randomly sorted in with my project06:46
Peng_meoblast001: Well you can't delete other peoples' stuff.06:46
meoblast001i don't know why06:46
meoblast001i don't want ot06:46
meoblast001i dont want it in my project06:46
Peng_meoblast001: It looks like it's related to your project.06:46
BasicOSXThe server at bugs.launchpad.net is taking too long to respond. <- just me or others have problems?06:51
Peng_Umm, if Firefox wasn't swapping, I'd check.06:53
Peng_BasicOSX: https://bugs.edge.launchpad.net/ works for me06:55
Peng_Sigh, I think I've given up on "WFM" :(06:55
=== sabdfl1 is now known as sabdfl_home
wgrantbackz: You can use Launchpad for proprietary projects, but you have to pay.07:43
olliepetch_hey guy's i'm just exploring the bzr code base and am trying to find where a file is distinguished between text or binary before a delta is written to repository, can anybody let me know where this code lye's? cheers14:00
olliepetch_hey guy's i'm just exploring the bzr code base and am trying to find where a file is distinguished between text or binary before a delta is written to repository, can anybody let me know where this code lye's? cheers14:05
Peng_Deltas are binary, although the current formats are all line-based.14:05
Peng_So...it doesn't.14:06
LarstiQolliepetch_: I suppose you want to accomplish something with this information?14:08
olliepetch_yeah i want to add an extra check to see if it is a odf file, so i can open up the archive and store difference data on the content.xml file14:10
LarstiQolliepetch_: hmm, I'd probably start by looking at the different merge types in bzrlib.merge14:12
yacoobIf I have a shared repo, with one branch in it, would branching it outside, and then pushing to a "new" branch in the same repo result in shared storage use?14:45
yacoobor do I need to go to the repository and do 'bzr branch old new' there?14:45
james_wit would14:46
james_wthe second option only requires one branch operation though14:47
LarstiQbut the results inside the repo would be the same for options 1 and 214:47
yacoobgreat, that's what I expected, but I wasn't sure :)14:48
yacoobso, how is it done under the hood? I mean, do the branches have uuids and upon new push bzr recognizes that the new one was branched from the old one? Or does it analyse the files and spots similarities?14:50
LarstiQyacoob: every commit has it's own unique revision id. A branch is just a pointer to a revision.14:53
LarstiQyacoob: so if you just `bzr branch old new`, all the revision objects will already be in the repo, 'new' is just an additional pointer.14:53
yacoobLarstiQ, what I'm wondering about is, if I'm pushing *some* branch X to a shared repo - will it share storage only if it has been branched from something already in the repo, or will it work as long as the files in the branches have "similar" content?14:55
LarstiQyacoob: it will need to share revisions, files having similar content will not do it.14:56
Peng_(Although they might in a future disk format.)14:57
Peng_Err. Did that make sense?14:57
LarstiQyacoob: you can use `bzr missing` to see which revisions will take up additional storage space.14:57
LarstiQwell, roughly14:57
LarstiQs/see/get an idea of/14:57
* Peng_ goes to bed. Maybe.14:57
yacoobneat, thanks14:58
nekohayolet's say I want to revert a change that was made in a previously merged revision, what would be the best way to go about it?16:22
nekohayolet's say I'm at rev 119 and I want to revert what was done in rev 98.3.3616:22
LarstiQnekohayo: you can commit the reverse diff: `bzr merge -r 98.3.36..98.3.35 .; bzr ci`16:23
nekohayoo_o and that won't mess up history or anything616:24
nekohayoso basically, "bzr merge -r 98.3.36..98.3.35 ." and then "bzr commit". Interesting16:26
LarstiQnekohayo: that will leave the old 98.3.36 intact.16:26
LarstiQnekohayo: if you needed to remove that revision, you could bzr uncommit (and then a rebase invocation to keep the content of the newer revisions)16:27
nekohayonah, I guess just reverting the actual code is enough16:27
nekohayoit's not seen as a "merge" by bzr status though16:27
nekohayoI guess it's just as if I did the diff manually and committed a new revision16:28
* LarstiQ nods16:28
nekohayoabout cherry picking, I'm still a bit confused. What happens to history if I cherry pick something from another branch? And more importantly, does using cherry-picking imply that once you use it, you must keep using it for all further merges from that branch?16:29
nekohayothat's basically what makes me hesitant to use it16:33
LarstiQnekohayo: to start at the end. No, you don't need to keep using cherry-picking.16:35
LarstiQnekohayo: the first question, nothing happens to history.16:35
nekohayo(actually it was pretty much the same question, now that I think of it ;)16:35
LarstiQnekohayo: A cherry pick in Bazaar does not currently record any metadata, only content changes.16:36
nekohayoLarstiQ: example: I merge from "bob" who has revisions 1,2,3,4, and I cherry-pick 2-3. But then if it doesn't merge the metadata, what will happen when I do a simple "bzr merge bob" afterwards? that's what was puzzling me16:38
nekohayowon't it pull in revs 1,2,3,4 all at once?16:38
LarstiQnekohayo: yes, but Bazaar will not conflict on the content of 2,3 already being present16:43
nekohayooh, that's nice :) I guess it's just a social question rather than a technical one then16:44
nekohayoas in if you disagree with someone's branch or something, you have to keep cherry-picking it ;)16:44
LarstiQnekohayo: If there is just one thing you disagree with, merging everything and applying the reverse diff works as a 'reject'.16:47
LarstiQnekohayo: in general we tend to encourage doing orthogonal work in seperate branches16:48
nekohayoLarstiQ: ok, but that needs to be done in separate commits, afaik. Actually, I'm not in need of things like this so far, I was just doing an exercise in thought :) is there such a thing as a bazaar/dvcs etiquette in the docs?16:51
LarstiQnekohayo: maybe, I'm not aware of it. It's a good idea though.16:52
nekohayoI think it would be a neat thing for switchers from centralized models, or even for people starting from zero into the VCS world16:53
* LarstiQ nods16:54
nekohayoLarstiQ: I obviously don't have the knowledge for this, but should I file a bug about bzr's docs or something?17:03
LarstiQnekohayo: if you can't find such a thing on the wiki or on doc.bazaar-vcs.org, go ahead17:05
LarstiQnekohayo: or perhaps start a page on the wiki17:05
LarstiQnekohayo: http://bazaar-vcs.org/Scenarios might come close17:05
nekohayoindeed, "Review and accept changes from others, into a project that I manage using bzr" ; however, that page doesn't exist :)17:08
LarstiQnekohayo: create it, note down how you think it should be done, and someone will correct it if needed! ;)17:10
nekohayothat's the problem, I don't really have much of an idea how it should be done :)17:11
LarstiQnekohayo: I have some ideas for that17:15
nekohayohm. maybe you could start that etiquette/good management practices page and I could watch it and comment17:17
* nekohayo has a weird feeling that this is also the kind of things that usually gets demonstrated in live talks17:18
LarstiQit is17:18
nekohayoafaik there are no recordings of those talks on the website :)17:19
LarstiQnekohayo: I've put it on my todo list, I won't be doing it for a while today17:19
nekohayoshould I point specto to a particular page to watch out for?17:20
LarstiQnekohayo: the Scenarios page17:21
luke-jrI'm trying to create a branch with its first revision being a merge of another existing branch19:31
luke-jreg, start the numbering over at 119:31
luke-jryet, if I do bzr init foo; cd foo; bzr merge ../bar19:32
luke-jrbzr status says I am not "up to date" and bzr update deletes all the merged files; bzr commit then creates a revision with delete for all of them19:32
luke-jrwhat am I doing wrong? :/19:32
jkakarluke-jr: I don't think you want to do a merge.  This is basically just a fresh branch with a bunch of new files added... ie: you explicitly don't care about the history of those files.19:38
luke-jrjkakar: I *do* want the history19:38
luke-jrjust as 0.1.*19:38
luke-jrI also want to retain the ability to merge from other branches19:39
jkakarluke-jr: Hmm.  Why do you care about the revision number starting at 1?19:39
luke-jrjkakar: I'm importing ☺19:39
jkakarluke-jr: Uhm, I don't understand what that means.19:39
luke-jrand I'd prefer my trunk branch not be renumbered19:39
luke-jrI'm moving my Subversion repository19:39
jkakarAh ha.19:39
luke-jrrev 1 is my initial import19:39
luke-jrI want to keep it the same in Bzr19:40
jkakarI'm not sure how you would do that, sorry.19:40
luke-jrif it was rev 2, it'd be easy19:40
luke-jrstupid me19:41
jkakarIf the SVN repository is public, I would probably just arrange Launchpad to do a vcs-import for me and let it all happen magically.  I don't think it'll do what you want withj revno's though.19:41
luke-jrsvn and bzr revno are going to differ no matter how I do it19:41
luke-jrjkakar: not that simple ☺19:41
luke-jrI don't think Launchpad's VCS import is designed for branches spanning CVS and Subversion both19:41
jkakarluke-jr: Launchpad can import from CVS and Subversion.19:42
luke-jrjkakar: whilst keeping merges between the two consistent?19:42
jkakarluke-jr: You probably need to use bzr-svn if you want to do that.19:43
luke-jrthat only works with Svn19:43
luke-jrnot CVS19:43
jkakarAh, I see.19:43
vinc456luke-jr: how do you type a smiley face?20:18
luke-jrI press ':'20:19
luke-jrthen ')'20:19
vinc456luke-jr: hmmm, maybe your client transforms it because when i message myself i just see a colon and right parenthesis20:21
NfNitLoopyeah, his client is sending some unicode character.20:25
ricardokirknerhi. I am tracking an svn bzr using bzr-svn.. I keep getting bzr prompting me for the password, although this is supposed to be already handled. I am trying to trace the auth code, but its never being called. Maybe its something to do with that my branch starts with https:// instead of svn+https:// ?20:29
luke-jrbzr: ERROR: Prefix missing for branches/randomRange; please create it before pushing.20:37
luke-jrwtf? :/20:37
=== bob2_ is now known as bob2
bob2bzr push --create-prefix20:41
bob2it doesn't create more than one level of directory, by default20:41
ricardokirknerhey jelmer. how are you doing?20:59
ricardokirknerI just wanted to know if some behaviour I am seeing is alright or is a bug: when I have an svn branch directly using the https:// transport, it doesn't use the svn credentials; however if I use the svn+https:// transport it does, but it says the svn+ is deprectaed and I should use the https directly21:01
ricardokirknerI would like to fix this issue (if it is a bug indeed), but I would like some guidance, as to not loose myself within the code :-)21:02
LarstiQsounds like a bug to me21:02
ricardokirknerI guess I would have to modify the bzrlib/transport/http/<somefile>21:03
ricardokirknerto determine if the underlying repo is svn or not and in the former case, request the svn credentials21:03
ricardokirkneram I right?21:03
LarstiQricardokirkner: no, that doesn't sound right21:03
ricardokirknerLarstiQ, what do you suggest?21:03
LarstiQricardokirkner: bzr-svn does interact with the http:// url, right?21:04
ricardokirknersupposedly, yes21:04
ricardokirknerI mean, it is working alright, except for the credentials stuff21:04
ricardokirknerit is as if the http transport is being handled by another handler that is not svn aware21:05
ricardokirknerwhich make complete sense21:05
ricardokirkneras the http protocol might be used for bzr repos too21:05
LarstiQtransports and credentials aren't tied directly to each other21:06
* LarstiQ looks at the bzr-svn code21:06
LarstiQricardokirkner: svn/auth.py is where I'd look21:07
ricardokirkneryes, I have already looked in there21:07
ricardokirknerthe thing is, the auth.py stuff is not being called for credentials21:07
ricardokirknerI have set some breakpoints in there, but the pdb never halts on them21:07
LarstiQricardokirkner: but it does for https?21:08
LarstiQhow have you set breakpoints, and where?21:08
ricardokirknerwhat I meant before is: the svn repo handling is working alright, but the http/https credentials stuff are being handled by another handler21:08
ricardokirknerI am running "pdb /usr/bin/bzr pull"21:08
ricardokirknerwhen it starts I set a breakpoint on the code I want to analyze21:09
ricardokirknere.g. auth.py21:09
LarstiQhmm, that might work21:09
ricardokirknerand let it continue21:09
* LarstiQ usually does 'import pdb; pdb.set_trace()' in the code directly21:09
ricardokirknerso I have seen that the auth.py code that handles credentials is not being called21:09
ricardokirkneryes its the same21:09
LarstiQricardokirkner: specifically SubversionCredentialStore.decode_password?21:10
ricardokirknerspecifically create_auth_baton21:10
ricardokirknerand from there downwards21:10
LarstiQricardokirkner: for debugging, I'd next look at get_credentials in bzrlib/config.py21:10
ricardokirknerwhat I just saw is that if I dont specify the credentials in the url, it fails; if I do, the default http credentials stuff is being called21:13
ricardokirknerI will look at the config stuff now21:13
LarstiQricardokirkner: I'm not convinced create_auth_baton is meant to be called even21:13
LarstiQricardokirkner: is the regular credentials stuff also called if you provide a username, but no password?21:14
ricardokirknerLarstiQ, exactly, if I provide the username as part of the url, the http credentials handler is called21:15
ricardokirknerand prompts for a password21:15
ricardokirknerafter I enter the password everything works fine21:15
LarstiQricardokirkner: hmkay21:15
james_wI seem to remember something about putting something in authentication.conf to allow bzr-svn to provide the credentials21:15
ricardokirkneranother possibilty is that the SvnRaTransport is not being added to the list of possible_transports21:15
LarstiQricardokirkner: this area certainly has bugs that need squashing21:15
LarstiQricardokirkner: right21:15
ricardokirknerso, once it fails trying with the default handler, it exits21:16
ricardokirknerI am not sure thought if the SvnRaTransport should be added to the list of possible_transports for the http/https protocol (althought it doesn't seem so far-fetched)21:16
ricardokirknerLarstiQ, ok, I found a possible solution (pretty easy and straightforward too). I am not entirely sure if it is completely correct, and would like feedback on it21:27
ricardokirknerI basically registered SvnRaTransport as lazy transport for the http and https protocols, in the __init__.py file of the svn plugin21:27
ricardokirknerand it works (with the minimal testing I did so far)21:28
ricardokirknerif this is alright.. what steps should I do to include this fix into bzr-svn?21:28
ricardokirkner(btw, another solution that works, is to add the repo to the authentication.conf file :-))21:29
LarstiQricardokirkner: with password_encoding=subversion?21:29
LarstiQI guess not :)21:30
LarstiQricardokirkner: how do you add it to authentication.conf?21:30
ricardokirknerno, in the authentication.conf file I just specified username, password21:30
LarstiQah, well, yes :)21:30
ricardokirknerand host21:30
ricardokirknerbut the other approach (registering the transports in __init__.py) seems better (less intrusive on the user)21:30
ricardokirknerwhat do you think?21:31
LarstiQricardokirkner: I don't know the code well enough to judge if that is a correct thing to do.21:31
LarstiQricardokirkner: one issue for example is not loading the svn plugin until it is really needed21:31
ricardokirkneralright... what's the usual approach here? should I branch the bzr-svn code, fix the code in my branch, submit a bug request, and submit a possible solution pointing to my branch for review?21:32
LarstiQricardokirkner: yes21:32
ricardokirknerwill do that now21:32
ricardokirknerthanks a lot for the 'mentoring' :-)21:32
LarstiQno problem :)21:32
LarstiQricardokirkner: for the last part, linking the branch to the bug is what I'd do21:33
james_wI think password_encoding is the way it is supposed to be enabled21:44
LarstiQjames_w: is that a choice not to use credential stores unless explicitly told to?21:47
james_wI believe so, but a debated one21:47
LarstiQyeah, I believe the out of the box experience for svn at least should be better21:47
=== AnMaster is now known as AnMaster_ipv6
ricardokirknerjames_w, yes, I agree with LarstiQ23:07
ricardokirknerI am almost new to the bzr codebase23:07
ricardokirknerbut I have seen there is the possibility to register several transports for a protocol23:07
ricardokirknerthe problem is that when the first transport fails, the next ones are not tried out23:07
ricardokirknermaybe if we allow to iterate over all transports, until we reach one that succeeds, it would be just a matter of registering several transports for http/https23:08
ricardokirkner(e.g. register the svn transport if it exists as the first one, and fall back to the default transport for http if the svn one fails)23:09
ricardokirknerjames_w, btw, if you could point me to the thread where this was discussed, it would be really helpful23:10
ricardokirkneras, currently, one of the greatest benefits of git for me right now, is that it supports svn out of the box; I wish I could have that issue less in my comparison between bzr and git , as I would really like to continue using bzr as my default vcs23:11
james_wI only remember the discussion about whether the methods should have to be declared from IRC, sorry23:11
james_wif you post to the list or file a bug then it would probably revive the discussion23:12
ricardokirknerjames_w, alright.23:12
ivanif you want to make a small fix to all of your very different branches, what's the right thing to do?23:17
ivanmake it in one and cherry-pick it to everywhere?23:18
=== rryan` is now known as rryan

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!