glyphsince I show up periodically to complain I figure I should stop by to say something nice too00:11
glyphI have been working this week using bzr and rebase rather than working in svn branches00:11
glyphand it has been fantastic.00:12
glyphit has improved the quality of my development experience significantly.00:12
glyph(now go fix all those bugs plz)00:12
mkanatglyph: That's awesome!00:14
spivjelmer: hey, the daily builds PPA looks nice!00:15
jelmerspiv: Thanks :-)00:16
glyphOne thing I'm wondering about: is rebase supposed to be able to 'fix' merges that have gone in the other direction?00:16
lvhCan anyone reccomend any good bzr-supporting project management packages that I can host in-house?00:36
lvhI tried redmine, but it doesn't do multiple branches -- there's a patch, but that's basically broken.00:36
spivlvh: trac, maybe.00:40
lvhspiv: :-(00:41
lvhspiv: I was hoping you weren't going to say that, but okay00:41
spivlvh: there's also Launchpad00:42
lvhspiv: I was under the impression lp is not something you're supposed to host in-house.00:42
lvh(supposed to being distinct from 'possible')00:42
spivWell, I wouldn't really recommend it.00:43
spivHard to say if the effort of deploying something as overkill as LP is better or worse than Trac ;)00:43
lvhspiv: honestly I'd just use fossil if there was a bzr-fossil00:45
lvhspiv: also http://trac-hacks.org/wiki/PeerReviewPlugin/Documentation C-f "to be written"00:45
spivlvh: hmm, for code review specifically there may be options00:48
spivI wouldn't be surprised to find that reviewboard or something has bzr support.  And there's also BundleBuggy, which bzr used to use before Launchpad.00:49
lvhspiv: I had forgotten about bb, thanks00:50
mkanatlvh: Bugzilla isn't a PM system, but it does have a VCS extension that supports bzr.01:13
spivmkanat: ooh, that's good to know01:15
mkanatYeah, http://code.google.com/p/bugzilla-vcs/01:15
mkanatI just did another release of the VCS extension today, in fact, partially to improve bzr support.01:15
spivYay :)01:17
jbowtiejelmer:  bzr-tfs in trunk supports CodePlex.01:18
mkanatAnd I'm pretty sure that my Perl module on CPAN is still the only Perl interface to bzr.01:18
jbowtieSo hopefully I'll be able to release that this weekend.01:20
glyphis there a way to ask, during an interrupted rebase, 'what was the commit message for the revision that I am fixing conflicts on'?01:47
GungaDinare there any diagnostic tools for criss cross merges? how can I know why and for which files they're caused?02:24
=== oubiwann-away is now known as oubiwann
spivGungaDin: bzr qlog03:05
spivGungaDin: (or 'bzr viz' if you prefer bzr-gtk to qbzr)03:05
GungaDinthat doesn't tell me what file(s) specifically it was caused by..  does it?03:10
fullermdWhat do you mean by "caused by files"?  Criss-cross refers to the revision history...03:11
GungaDinyeah, but the revision history contains the history of file/dir changes, no?03:12
fullermdI suppose.  It just seems like a weird way of looking at things.03:13
GungaDinwhy's that?03:13
fullermdI mean, you could build a of all the revisions at and after the cross, then list all the files that got changed, but what would that tell you?03:13
GungaDinI just want to know why a criss cross is caused.03:14
GungaDinwhat caused it.03:14
fullermdIt's not caused by any files, it's caused by the shape of the revision history.03:14
GungaDinfine, then at which point that shaped changed to cause it.03:15
spivRight, that shape is the revision graph, and that's what qlog/viz show you.03:16
fullermdI don't know of anything existing that can spit out "these are the crossed merges".  You can often spot them in something like qlog/viz if the affected area is small enough that they're nearly-enough on screen together.03:16
fullermdIf it spans enough revisions, it gets messy trying to parse visually.03:16
spivYes, it would be nice to add something that can help users see and understand where the criss-cross happened.03:18
fullermdI s'pose to somebody reasonably conversant with bzrlib, it would be fairly straightforward to rip out the bits of the 3-way merger that detect the cross to make a lister.03:18
spivWell it's basically just Graph.find_lca (or Graph.find_unique_lca if you want to force bzr to find just one... the hidden find-merge-base command calls this) to identify the revisions.03:22
spivBut you'd also want to somehow describe which edges crossed, I think.03:22
* fullermd wishes revctrl.org were actively curated :|03:27
* spiv too03:30
ultramagehello, I wanted to try out Bazaar (windows, standalone). I installed it, ran 'bzr', then 'bzr help commands' to see what options there are.09:47
ultramageand I got bzr: ERROR: Bazaar Explorer requires QBzr. Please install QBzr (https://launchpad.net/qbzr).09:48
ultramagewhy does 'bzr help commands' tell me to install a GUI component that I don't want?09:48
ultramageif it's a mandatory component before you can actually use the software, then include it in the base distribution09:51
ultramageI will wait until you people wake up and are able to answer my questions10:00
jelmerultramage: It looks like you have bzr-explorer installed but not one of its dependencies, qbzr10:09
jelmerultramage: Did you install bzr-explorer, perhaps as part of the windows install?10:10
ultramageah, I see, that would be it10:10
ultramageI can't recall seeing Qbzr as one of the options... but installing it separately solved that10:10
ultramageit's weird that the commandline tool would just outright refuse to run, instead of failing gracefully and just displaying a subset of the commands or something10:11
Takdoesn't the windows installer include bzr-explorer and all the deps?10:11
Takat least, it Worked For Me10:11
ultramagelemme re-run it and see if I unchecked anything obviously vital10:11
jelmerarguably it shouldn't let you install a combination of plugins that won't work, but I'm not sure how hard it is to forbid that in the windows installer10:13
ultramageyes, I see now10:13
ultramageI picked the bazaar explorer gui, but unchecked the qbzr plugin at the very bottom10:14
ultramage"dialogs for gui applications and IDEs"10:14
ultramage(doesn't say 'vital component of bzr commandline utility' though)10:14
ultramageI guess that it's a component interaction issue10:14
ultramageanyways, that's solved from my point of view10:14
ultramagenow to the questions... I'm looking to replace an existing version control application that I've been using so far, and I've got a few quick questions about Bazaar features, if you don't mind10:15
ultramage* must each bazaar branch directory (which I consider a 'checkout') store its own clone of the repository it's using?10:16
Takfrom which vc are you coming? ;-)10:17
ultramagebecause what I'm doing right now is having the upstream repositories mirrored at a central location on a network share, and just doing lightweight checkouts against those (basically, a small directory with a human-editable config file)10:18
Taka bzr branch by default contains all the history for that branch10:19
Takwhat is it that you /want/ to do?10:19
LenZultramage: bzr supports "lightweight" checkouts10:19
ultramagewell, for example, make four checkouts of the target directory10:20
ultramagewithout having the entire history mirrored four times10:20
LenZultramage: Take a look at "shared repositories" as well, to save disk space.10:20
ultramagemmm okay :)10:20
Takif you create a shared repository locally, then branch into that, you'll get what you want10:20
ultramagewhich part of documentation does this fall into?10:21
ultramagea suitable name10:23
Takthe "feature branches" section seems relevant10:23
ultramagehmm, 'bzr branch' and 'bzr checkout' seem to have produced the same result10:24
Takbranch gives you an unbound branch which you can manipulate locally10:25
Takcheckout gives you a bound branch that requires connection to the remote server for most operations (very similar to an svk checkout)10:25
ultramageno, svk checkout requires a local mirror to be available10:25
ultramageer, prepared10:25
ultramageso basically, the difference between a checkout and a branch is that you're not supposed to commit directly into a checkout?10:26
ultramage(in svk, when doing a commit, it sends it to the remote repository, syncs the local mirror and then pulls the changes from there)10:27
Takthe difference between a checkout and a branch is that commits to a checkout are immediately pushed to the remote repo10:28
ultramagedoes the write first happen to the checkout, or to the remote repo?10:29
ultramagemaybe I should try it out more first... I'm still not at a point where I could say "yes, this is what I want to use"10:30
ultramageI guess I'm still thinking in terms of one central svn repository10:31
maxbIIUC checkouts provide a firm guarantee that the commit will not actually happen locally unless it succeeded remotely10:35
ultramagewhat's pretty confusing is that I'm not used to thinking in terms of branches... most of the time, when I work on something, I have the entire repository mirrored and ready for access, not just one branch10:36
ultramageyes, that would be good :)10:36
maxbultramage: Yes that is one of the philosophical quirks of Bazaar relative to other VCSes - to Bazaar, a branch is the primary object. That several might be stored near to each other in a wider repository is a mere detail10:38
maxbWhich is quite a contrast to git10:39
ultramageso far I've been using a particular feature of svk, where if you make a dedicated mirror of the root, the revision numbers will align10:40
ultramageso later on when you run svk annotate, or even just svk info, if it says r12345 you know you're talking about r1234510:40
ultramagedoes bzr have the concept of sequential revision numbers?10:40
ultramageLamport clock and all that stuff10:41
ultramageI read the 'feature branches' guide but haven't understood the concept10:44
ultramageI don't think that's what I'm looking for... or the examples used there don't demonstrate it10:45
spivYes, each branch has sequential revision numbers (but they aren't in general comparable between different branches)10:45
ultramagethat's okay if I can treat an entire repository checkout as a single brnach10:46
ultramage(which it seems I can)10:46
ultramagethe feature branches example seems to imply a way to start a branch from another branch... not exactly sure10:47
ultramageconfusion levels are high :)10:48
maxb"Lamport clock" ?10:48
maxbOK, so first important thing - if you import svn into bzr via bzr-svn, each imported revision tracks the svn revno it came from (and this is displayed in bzr log)10:49
maxbI'm a bit confused by what you mean  by "treat an entire repository checkout as a single brnach"10:50
spivultramage: basically feature branches mean to do a new set of work on your code you: start a new branch (from the current version of your 'trunk', usually), perform the work on that branch (for however long it takes, minutes, days, months...), then when it is finished you merge the entire set of changes from that branch back into the original branch.10:51
spivultramage: this avoids having half-done work on your main branch, where it can break things and interfere with other people trying to work on that code.10:51
maxbBy definition, a (non-lightweight) checkout *is* a branch - there is no "treat as"10:52
spivultramage: as a logical extension of that, if during that feature branch there's some smaller feature that needs to be done, you can make a new feature branch for *that* (based off the first feature branch, or off trunk, depending on what suits you best)10:53
spivultramage: e.g. everytime I start working on fixing a bug in bzr, I first make a new branch of bzr, and do that work in that branch.10:53
ultramagein svk you can mirror into a subdirectory (mirrored branch) and make local branches next to them... and since they're all in a single local depot, you can merge across them10:54
ultramagehowever I don't use that feature10:55
spivRight, bzr can merge between any branches that share history (regardless of whether they share a repo).10:55
maxbultramage: With bzr, think of the entire filesystem as your depot10:55
ultramageif I have two independent things going on at the same time, I just make two quick checkouts10:55
spivultramage: now imagine you can make multiple commits in those checkouts before those changes affect the original repo10:56
ultramageI guess that approach is good if you want to make a bunch of local commits before you're done with everything10:56
ultramageso I guess this is to avoid making a publicly visible dev branch in the remote repository10:56
spivRight, exactly.  If you only ever need a single commit to make a complete change ready for the main line of development that everyone is working on, then you don't need feature branches.  But if you e.g. want a development process where you develop a change, then it goes through code review or QA, then maybe gets further changes due to that, then a feature branch starts making lots of sense.10:57
ultramageI have not used this approach because the extra commits make your local revision numbering go out of sync10:57
spivWell, using feature branches is orthogonal I think to whether you make the work-in-progress visible.  Certainly you can use them like a checkout that you don't share until its done, but you can also share your work-in-progress with them (rather than sharing it via landing half-done work on your trunk).10:58
ultramage(so when I ran svk annotate later, I'd get local numbers instead of the remote ones... and even if I did get remote ones, I'd still have to figure out what the matching local ones are010:58
ultramagemaybe bazaar tracks revision numbers for each branch individually  and this is not an isuse10:59
spivbzr has sequential revision numbers for convenience, and (although you rarely need to use them directly) unique revision IDs for when you need to refer to a revision independently of where it is in any individual revision history.11:00
spivYes, a revision number is a per-branch attribute.11:00
spivIt's always "revision number X in branch Y"11:00
ultramagehmm, question; if I check out http://svn.something.com/trunk, will my checkout's .bzr/repository directory only store data for the trunk branch?11:01
ultramageI guess that's easy enough to test :D11:02
ultramageyep, it does11:02
ultramageso if I ever lose network connectivity and have the need to look anywhere past that branch, I'm out of luck11:02
spivYou can use 'bzr init-repo' to make a shared repository; branches created under that directory will then share revisions.11:02
spivOr you can use 'bzr svn-import' to just mirror the whole SVN repo in one go.11:03
spiv(and it takes care of making a shared repo for you)11:03
ultramageI'll look at that :)11:03
ultramagewell, it looks exactly like a checkout, without the checkout :)11:05
ultramagewell, and it doesn't have the 'bound' attribute and has 'no-working-trees' and 'shared-storage'11:07
spivYou can make a checkout with "bzr checkout BRANCH_DIR CHECKOUT_DIR".  If they're both on disk you can use --lightweight to avoid making a new copy of the revision history.  If you like, you can do "bzr co ." in the branch directory itself to just make the checkout at the same dir as the branch.11:07
spivRight, svn-import makes "branches" i.e. copies of the original repo, rather than checkouts bound to the original repo.11:08
spivYou could make checkouts directly from your SVN repo if you like in that repo made by svn-import.11:09
ultramageI'm thinking11:09
spivThey'll reuse the history store already present, but commit directly back to SVN.11:09
ultramagehow about a bzr checkout of root, and then bzr checkout --lightweight of that checkout?11:09
spivYou'd have to fiddle with the settings of the bzr-svn plugin to make that work, it's not how bzr is designed.11:10
ultramagethat's probably the closest thing I can think of to my current setup11:10
spivI wouldn't recommend it, you'll be fighting bzr rather than working with it, and you're likely be dissatisfied with the result.11:11
ultramageso I've yet to actually set up my files for testing... this is not good11:11
spivWhy do you want a single tree containing the contents of every branch and tag (and trunk)?11:12
maxbchecking out the root of a svn repository using bzr-svn is not at all what you want to do11:12
spivThe obvious reasons I can think of have better solutions.11:12
ultramageyes, I know that doing an actual checkout of a project with 1000 tags is nuts11:13
ultramagethe idea of just putting a few select branches next to each other sounds nice11:13
ultramageearlier you said "svn-import makes "branches" i.e. copies of the original repo, rather than checkouts bound to the original repo."11:14
ultramagemeaning that if I make a checkout of anything in there, and then commit from it, it will just corrupt my local imported data and never get to the original repo11:14
maxbuh? no11:15
ultramageI guess the main question is whether a commit operation into there is transitive11:15
maxboh, I see.11:15
ultramagebecause starting an independent local fork of a project's central repository is not what I want to do :)11:16
maxbRight, you'd want to checkout from the upstream repository11:17
ultramagesvk ensures I always have access to anything I need from the repository even when offline, so if I suddenly get the need to run svk annotate on some branch I normally did not check out, I can do that.11:18
ultramageplus there's also the upside that all svk depots are simple svn repositories and can be hooked up to anything that reads svn repositories11:19
ultramagethe reason why I'm looking into bzr is that all svk development has halted years ago, it has data corruption issues on windows, it's perl-based and I never got it to actually install, and that none of the bugreports I submitted ever got taken care of11:21
ultramageplus it can't handle svn:externals11:21
ultramageok, so first things first... is it possible to make two checkouts of the same remote branch, without occupying twice the disk space?11:22
maxbSure - the best way to handle this is a bzr shared repository (created with init-repo). Any branches / checkouts you create below the directory inited as a repository will store their revision history in the repository, not within the branch/checkout itself11:23
maxbcommon data will be shared appropriately11:24
ultramageI just made a basic checkout of a branch, and then ran bzr annotate on it11:25
ultramagethe revision numbers displayed are local to my checkout and have nothing in common with the original repository - so I cannot do anything with them unless I look them up in my checkout11:26
ultramageit's the exact same issue as I had with svk's local depot approach - it makes the revision numbers go out of sync11:27
spivultramage: if you look at the 'bzr log -r REVNO' for the bzr revision, it'll tell you the SVN revision11:27
ultramagespiv: that would get very tedious very fast11:27
spiv(it's possible that one of the GUI plugins like qbzr or bzr-gtk has integrated that into their annotate... it would make a nice improvement if it hasn't already been done)11:28
ultramageI guess this is why noone uses revision numbers anymore when talking about revisions11:28
spivHmm, I guess with qbzr's "bzr qannotate" when you click the line it shows you the revision in the lower pane, maybe that already includes the SVN revno11:28
jelmerYes, qbzr's qlog will show you foreign revision ids.11:28
spiv(be nice to have an option to show the SVN revno in place of the bzr one though, I agree)11:28
ultramagewhen I see a bugtracker entry saying "fixed in r17005", how do I determine which one that maps to in my checkout? or whether my checkout is older or newer?11:28
jelmerloggerhead does as well11:29
spivultramage: well, you can do "bzr log -r svn:17005" or whatever to talk to bzr in terms of svn revnos11:29
Takfewer people talk about revisions anymore because git and hg turned them into meaningless spam :-P11:29
ultramageyes, it's why my first phase was throwing out all software that uses hashes11:30
ultramageno total ordering, not even partial11:30
ultramageI don't even want to imagine the hell it would be to do more complicated stuff without a GUI resolving those hashes for you11:31
ultramagemaybe that's why big projects' bugs take so long to fix - the developers are busy figuring out which revision is which11:32
spivWell, mostly you find it's enough to talk in terms of branch tips.11:32
spivBut it depends on exactly what you're doing, of course.11:32
spivI wish that was the biggest problem with fixing bugs in large projects!11:33
luksthere are projects without a mainline (e.g. linux), so I can see revision numbers not being useful there11:33
ultramageyes, but I guess they worked around that by having artificial release numbers and use them as checkpoints11:34
ultramagehah, even after checking out the root, the revisions are all shifted by 1, just like in svk11:37
ultramagethat's why they added a special root mirroring depot type11:37
ultramageI guess this is the consequence of being able to add extra local branches into the same local repo as the mirrored data11:40
ultramagequestion - when you people refer to some previous revision in your commit message, how do you refer to it?11:44
ultramagedo you open a second console window, ask bzr to look up the revision number you want, and copy-paste the revision id hash into your message?11:44
luksI personally almost never use revision IDs11:45
luksso, if necessary, I look up the revision number11:45
ultramageah, I see11:45
luksI use append-only branches, so the numbers don't change once pushed to the central repository11:45
ultramagethis could be another artifact of centralized version control11:46
ultramageusually when I'm fixing something, I leave a reference to the revision where the thing I'm fixing broke11:46
maxbultramage: It seems to me you are placing a little too much importance on revnos12:03
mgornyis it possible to get a unique identifier of a bzr tree (or at least revno --tree) without enforcing network activity?12:13
LenZultramage: You may also want to look into tags for identifying specific changes. They are cheap in bzr.12:13
=== deryck_ is now known as deryck
=== Meths_ is now known as Meths
rubbswhen trying to do a bzr st I get this error on a parent branch. http://paste.ubuntu.com/523884/14:58
rubbsbasically says the dirstate file appears to be corrupt14:59
rubbsthe user was using bzr explorer when trying to merge files into this branch. He said he got a "Bad File Descriptor" error15:00
rubbshere are the relevant log entries: http://paste.ubuntu.com/523895/15:08
rubbsthink I figured it out. I moved .bzr/checkout to .bzr/checkoutOld, did a lightweight checkout in another dir and copied the new .bzr/checkout dir to the old location. seems to have worked.15:25
vilarubbs: That's indeed the blessed workaround15:26
vilarubbs: It would be nice to better understand how this happened though15:27
rubbsI'll dig around and find out if I can find more info for you. I'm not the one who had the issue, I'm just the janitor ;)15:27
rubbsbut I'll see what I can find, if I get enough info I'll file a bug15:27
rubbsor add it to one of the others I found15:27
radixIs there yet a tool that watches a bzr  branch for changes and sends notifications when it does (email, IRC, or whatever)?15:30
jelmerradix: Hi15:33
jelmerradix: Yeah, there was a daemon that does local branch monitoring and can send out emails.15:33
radixjelmer: nice15:45
radixjelmer: lp:??? :)15:45
jelmerradix: I'm not sure where it lives, it was developed by a debian developer so I'm not sure if it's on Launchpad15:48
jelmerradix: lp:bzr-hookless-email15:49
radixjelmer: sweeet, thanks.15:54
radixI'll probably hook up IRC notifications to that too15:54
=== adrian is now known as Guest51764
Guest51764Is there a merge method that ignores content changes (add / delete)? Some muppet made a branch in SVN by copying the folder, then SVN-deleting the sources, then SVN-adding the tree back again16:01
Guest51764Ohh, guest16:01
=== Guest51764 is now known as awilkins
jelmerawilkins: no, there isn't anything like that (yet)16:03
awilkinsSo when you merge this revision, you end up with a shower of conflicts (everything) as all the files get moved out of the way to make way for the "new" ones16:03
awilkinsgit just works for this because it just views the before and after of the revision as the same content tree ; would there be a way to get around it by cherrypicking that revision and properly merging the rest?16:04
awilkinsProbably not, the file-ids are not going to match... bah16:11
=== deryck is now known as deryck[lunch]
jelmerawilkins: yeah, that's the main issue. We need a way to make file ids converge16:18
rubbshrm... when I did the moving of checkout to chechout old thing. Now bzr explorer says there is no working tree.16:18
jelmerawilkins: Otherwise you'll have to use this other magic merge indefinitely16:18
rubbsfwiw I did copy a checkout into the .bzr directory from a lightweight checkout16:19
vilarubbs: you copy the whole checkout dir or only the dirstate file in there ?16:31
vilaonly the dirstate file is needed16:32
rubbswhole checkout, should I just have done the dirstate?16:32
rubbsoh, will fix that thanks16:32
vilahmm, I fail to see what would change though... may be you should restart bzr-explorer ?16:33
rubbstrying that now, as your suggestion didn't fix it.16:34
rubbsI'm going to try branching from it and see if I can see the second branch.16:35
rubbsif that works, I'll delete the original and branch to the original name16:35
rubbsand rebind as necessary16:35
rubbsweird. the new branch also reports as not having a working tree in B.E.16:37
rubbsbut it does.16:37
rubbsshould I try cleaning the tree and then doing a checkout?16:38
rubbswhen trying to clean the tree I get a "Nothing to delete" message, but it's got a working tree.16:45
rubbseven weirder is that if I delete out the tree bzr st reports that i made changes by deleting everything out.16:46
vilayou did restart bzr-explorer ?16:47
vilarubbs: Are you on windows ?16:48
rubbsvila: yes restarted bzr-explorer, and I'm on Ubuntu, my coworker is on Windows. my instance of bzr explorer tells me I have no working tree16:49
rubbsI've even tried branching directly from the branch it was bound too16:49
* vila blinks16:50
vilabzr info ?16:50
rubbsvila: http://paste.ubuntu.com/523949/16:52
rubbsit's bzr version 2.2.1 btw if that makes a difference16:53
vilahmm, this shouldn't16:53
rubbsyeah I'm getting stumped too16:53
vilahmm, so I would try to trigger a dirstate update by doing some inocuous change16:54
vilaoh, or a bzr update16:54
rubbsoh, i'll try that. (I should have thought about that16:55
vilahmm, if you can afford such an update that is16:55
rubbsall local network so shouldn't be a problem16:55
rubbsah... looks like a lock needs to be broken16:55
rubbsI'll get him to do it as it's in his name. I'll let you know how it goes in a sec16:56
rubbsk... got the lock broken, but bzr update still didn't fix BE problem.17:03
rubbsBE still says the branch has no working tree17:03
rubbsalso, tried just did a "touch testing.txt" within the workign tree17:03
rubbsbzr st correctly says it's unknown, but BE still thinks there's no working tree17:04
vilarubbs: I'm lost :-/ Not being a BE user doesn't help iether :-/17:05
vilarubbs: and you restarted BE after 'bzr st' saw the unknown right ?17:06
rubbsyeah I'm not either, but coworker is. So this is somewhat important to figure it out.17:06
* vila scratches head17:06
rubbsI'll do it again just to make sure17:06
* rubbs is banging his head against the desk.17:06
vilabecause the problem disappears or because it's still there ?17:07
rubbsstill here. now I've got some permission thing when I try to merge, but I think I can figure that out17:08
vilarubbs: you didn't copy the dirstate file between windows and ubuntu right ?17:14
rubbsright, I did all my surgery on ubuntu17:17
rubbsoh this is frustrating. I can browse the tree with bzr explorer, but hitting refresh still says the branch has no working tree17:19
=== deryck[lunch] is now known as deryck
benje 17:34
benjei am using savannah and i would like to get help in use of bazaar explorer17:34
benjei am creating local branch but when i try to run the command to internet branch i get tehe following message17:35
benjebzr ERROR : Not a branch: "bzr+ssh://benje@bzr.savannah/nongnu.org/gxinterface/branch".17:36
benjei cannot find the advanced in menu too as describ in documentation http://doc.bazaar.canonical.com/explorer/en/tutorials/foss-contribute.html17:37
benjeto log in to my account (but maybe only for launchpad )17:38
benjei try the command in terminal but i get the same error17:38
maxbYou have a slash not a dot betweeen savannah and nongnu17:38
benjehow can we link project to internet server with bzr-explorer as i can work locally and put it once verified on internet server ? thanks17:39
benjemaxb: right, i get  it but i do a mistake on copy here17:39
benjeif i look to the savannah rep i see the .bzr17:40
benjeso why it's telling me not a branch ?17:41
maxbI would imagine your URL is incorrect17:42
benjei use this from savannah maxb17:43
benjebzr branch bzr+ssh://<membername>@bzr.savannah.nongnu.org/gxinterface/branch17:43
rubbsvila: ok, now this is weird. The windows guys are using bzr over an sshfs adapter (I'm going to change it so they use bzr+ssh from now on, as I think this was part of the problem). so on a whim, I mounted the drive to my local Ubuntu machine via sshfs, then I opened the "local" folder in B.E. and it seems to be working.17:45
benjemaxb you are right17:45
rubbsbut bzr+ssh:// does not work in B.E. at the same location.17:45
benjemaxb: if i try to got with http to bzr.savannah.nongnu.org/gxinterface no such file17:46
benjeok rubbs but even i do this on terminal without explorer ;)17:47
benjei try your method17:47
rubbsbenje: sorry was talking about my own problem not yours ;)17:47
benjerubbs: but this seems the same ;)17:47
benjeto get access with bzr+ssh to a rep17:47
rubbsnot exactly. I'm having problems with a dirstate file being corrupted by B.E. seems like you're having "not a branch" issues17:48
benjeexternal dir17:48
maxbbenje: It is not working because that project does not have any branch there on the savannah server17:51
maxbIt just has a bare .bzr control dir with no content17:51
benjeyes i create it and try to commit my rep maxb17:52
benjedo you think i have to rsync first ?17:53
benjersunc ok17:54
benjei don't understand what's happen :/ and what i am doing how can i make a brnahc on distant rep18:06
benjebrnahc branch18:06
benjei just want to commit local to server18:18
vilarubbs: I think you got something there and using bzr+ssh is certainly preferred (sorry for te delay, I EODed)18:55
rubbsvila: yeah I think I'm going to try to kill the sshfs stuff and see if I can't do some magic with bzr+ssh. the problem is that it's the bzr+ssh that's not reporting the working tree correctly :/18:56
vilarubbs: bzr+ssh is *not* supposed to handle working trees ! At least not today18:59
rubbsvila: ah, so what I need to do is get them to have a local one and bind it to the dev server?19:00
rubbsI c. I'll get that done19:00
rubbsthanks for the advice19:00
benjebye this was the problem https://bugs.launchpad.net/bzr/+bug/65976321:27
ubot5Launchpad bug 659763 in Bazaar "bzr smart server can't handle UTF-8 user names, gives UnknownErrorFromSmartServer (affected: 1, heat: 15)" [Medium,Confirmed]21:27
mbtI think I must just be a moron, but I have a merge that resulted in a conflict (which honestly I have never had happen before).  Is there somewhere online that explains what these conflict markers are and what they mean? The docs seem to skip that and just say that they're there.22:44
dashmbt: conflict means there's two possible outcomes for each block of conflicted text22:45
dashmbt: so one represents the change in the branch you're merging from, one represents the change in the branch you're merning into22:46
mbtRight.  I understand the reason for the conflict.  What I don't understand is the format of this thing.  Which is which?  What are the >>>>> and <<<<< and ===== supposed to actually tell me?22:46
dashthe bit between >>>> and ==== is one block22:46
dashthe bit between ==== and <<<< is the other.22:46
dashthere are also .OTHER and .THIS files containing the entire contents of the conflicted files22:47
dashand potentially .BASE, depending on your options22:47
mbtI'm still not getting it.  http://pastebin.com/MJdchVSu <-- what block is what?22:48
mbtOops, incomplete paste, try this one: http://pastebin.com/VdCypxAg22:49
dashthe first block (2-12) is what's from your tree22:49
mbtFrom which tree?  There working copy being merged into?22:50
dashthe second, 12-34, is from the merged-in branch.22:50
mbtSo that's as it was before the merge22:50
dashsame for 36-37 and 37-5522:50
mbtLine 35 is identical to both branches, then?22:51
dashright, it's not inside hte conflict markers22:51
dasha lot of editors provide support for this format; what do you use?22:52
mbtEmacs.  But I wasn't understanding what I was seeing, and it's all sorts of colorful, and I just wanted to know what I was looking at before I went any further.22:52
dashmbt: so your modeline probably says SMerge22:52
mbtNow the options for keep this and throw that away make sense though.22:52
dashyep. hooray.22:52
mbtYes, it is in SMerge minor mode.22:53
fullermdWell, technically, it doesn't mean it's identical.  Just that it merged without conflicts.  But in the case of a single line in the midst like that...22:53
mbtThank you muchly for the explanation, dash!22:53
bob2smerge is super awesome, aside from the default fruit salad colours22:54
mbtlol, I don't know what the defaults are since I use a colored theme on my Emacs, but the yellow was painful to look at.22:54
bob2I guess I mean 'the defaults are terrible and most color-themes don't fix it'22:56
mbtWhoo.  I believe I have resolved all my conflicts successfully.22:56
mbtHopefully, I don't run into that again... but I guess now the next time I do, I know what I am looking at.22:57
GungaDinhow can I tell at what revision a line was deleted from a file? (I can see who initially wrote it with bzr qblame.. but not when it was deleted...)23:05
mbtThat sounds like a problem that could be solved with bisection.23:06
mbtIf you don't have it already, grab a hold of a copy of the bzr-bisect plugin (https://launchpad.net/bzr-bisect) and see if that does what you need.23:07
mbtYou can give it a starting point and an ending point (essentially, a revision known to have the line you're looking for, and a revision known to not have that line) and then you can bisect until you find the first version that doesn't have it.23:07
dashi use bzr as a frontend to an svn repository and i'm trying to post diffs to a reviewboard instance. reviewboard seems to want svn style diffs, not bzr-style ones. i have seen mentions of an 'svndiff' plugin that might produce this, anbyody know where i can find it?23:24
bob2http://doc.bazaar.canonical.com/migration/en/foreign/bzr-on-svn-projects.html#svn-diff-style-patches ? (I dunno how reviewboard fits in)23:26
dashyeah i just saw that.23:27
dashtrying it now23:27

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