| ubotu | New bug: #181143 in bzr "inventory sha1 is not checked during routine operation" [Undecided,New] https://launchpad.net/bugs/181143 | 00:06 |
|---|---|---|
| abentley | In xml5, those sha1s are not reliable, because there are two xml5 serializations. | 00:13 |
| mtaylor | anybody have a problem with a little patch to allow the passing of a File() object in the output param of cmd_send._run() ? | 00:13 |
| lifeless | abentley: we should _always_ have the sha1 in the revision and that of the inventory match within a given repo | 00:15 |
| lifeless | abentley: if they don't, then check and reconcile should allow correcting that / reporting on discrepancies | 00:16 |
| lifeless | abentley: so what I ened is a InterDiffingSerializer that also does Model1To2 stuff | 00:17 |
| lifeless | abentley: is _install_revisions used by bundles? | 00:20 |
| abentley | Yes. | 00:21 |
| lifeless | so I think we generate check errors from it | 00:21 |
| lifeless | search for 'FIXME: TODO: The following loop *may* be overlapping/duplicate' | 00:21 |
| abentley | Old bundles only. | 00:22 |
| lifeless | oh, new bundles don't use it? | 00:22 |
| abentley | They don't use it for file texts. | 00:22 |
| abentley | Not sure about the rest, but I think not. | 00:22 |
| lifeless | hmm, I think CommitBuilder may fit in there now | 00:23 |
| abentley | For old bundles? | 00:23 |
| abentley | I think Jelmer had something that used it. | 00:23 |
| lifeless | heres what I'd like to do. I'd like to allow InterDiffereringSerializer to match (non-rich-root, rich-root|subtree) | 00:24 |
| lifeless | and use CommitBuilder in install_revisions which will take care of the differences automatically | 00:24 |
| lifeless | does that sound ok to you? | 00:25 |
| abentley | Seems okay. | 00:26 |
| lifeless | cool | 00:26 |
| abentley | Wait, | 00:26 |
| jelmer | abentley: I don't use install_revisions() anymore | 00:26 |
| lifeless | did you see the iter_inventories patch? | 00:26 |
| abentley | What about the tree_root knit? | 00:26 |
| lifeless | abentley: commit builder abstracts that out | 00:26 |
| abentley | Okay. | 00:26 |
| lifeless | you add the root, and a rich root repository will add an entry; non rich ones will assert that the revision is unmodified etc | 00:27 |
| abentley | What about Inventory.revision ? | 00:27 |
| lifeless | thats the inventories creation id so set by the commit | 00:28 |
| lifeless | IIUC | 00:29 |
| abentley | When converting from plain to rich-root, we assume the root revision changes every commit. | 00:29 |
| lifeless | right; the old tree has inv.root.revision == inv.revision | 00:30 |
| lifeless | so the commit builder will see those revisions when writing to a rich root repo | 00:30 |
| lifeless | I'm going to start a new isolated branch for this | 00:31 |
| lifeless | I'll make sure there are tests | 00:31 |
| abentley | Doesn't the commit builder have all sorts of clever logic determine the file's revision? | 00:31 |
| lifeless | yes, thats what we're missing in install_revisions which causes it to generate bad file graphs | 00:31 |
| lifeless | you're wondering if it will overwrite the information during conversion | 00:32 |
| abentley | If the commit builder commits to a rich-root repo, won't it assume the root revision should not change? | 00:32 |
| lifeless | yeah, I'll need to extend the api to be able to force this | 00:35 |
| lifeless | which is fine, it'll still be cleaner I think | 00:35 |
| mtaylor | jelmer: mtaylor@solace:~/src$ bzr svn-import --trees http://code.djangoproject.com/svn django | 00:35 |
| mtaylor | bzr: ERROR: Not a branch: "http://code.djangoproject.com/svn/django/branches/queryset-refactor/". | 00:35 |
| poolie | abentley, hi | 00:46 |
| abentley | poolie: hi | 00:55 |
| poolie | abentley, are you working at canonical now? | 00:56 |
| abentley | No, next week. | 00:56 |
| jelmer | mtaylor: You may want to remove the entry for django in ~/.bazaar/subversion.conf | 01:06 |
| mtaylor | jelmer: really? what's that entry for? | 01:06 |
| jelmer | remembers the branching scheme so it doesn't have to be recalculated each time you use bzr-svn | 01:07 |
| mtaylor | ah | 01:07 |
| mtaylor | how very, very weird | 01:09 |
| jelmer | ? | 01:09 |
| mtaylor | jelmer: I tried to do an svn-import of http://reviewboard.googlecode.com/svn/trunk/reviewboard | 01:10 |
| mtaylor | and it "worked" | 01:10 |
| mtaylor | except it left stuff out | 01:10 |
| mtaylor | or | 01:10 |
| jelmer | what sort of stuff did it leave out? | 01:10 |
| mtaylor | directories and stuff | 01:10 |
| mtaylor | the djblets dir for one | 01:10 |
| jelmer | you would probably want to import the full repository | 01:10 |
| jelmer | not just a part of it | 01:11 |
| mtaylor | yeah... sorry. I meant... http://reviewboard.googlecode.com/svn | 01:11 |
| mtaylor | (bad cut-n-paste) | 01:11 |
| jelmer | where should djblets be? | 01:11 |
| mtaylor | the trunk has one dir, reviewboard | 01:12 |
| mtaylor | and djblets should be in that dir | 01:12 |
| mtaylor | at least, it is when I do an svn co | 01:12 |
| jelmer | I don | 01:12 |
| jelmer | 't see it in the Svn webview | 01:12 |
| jelmer | are you sure you subversion checkout is up to date? | 01:13 |
| mtaylor | yeah - I didn't see it there either :) | 01:13 |
| mtaylor | I did this: | 01:13 |
| mtaylor | svn co http://reviewboard.googlecode.com/svn/trunk/ reviewboard-read-only | 01:13 |
| mtaylor | ls reviewboard-read-only/reviewboard | 01:14 |
| mtaylor | accounts contrib __init__.py README settings.py | 01:14 |
| mtaylor | AUTHORS COPYING iphone reports templates | 01:14 |
| mtaylor | autogen.sh devserver.sh m4 reviews test.py | 01:14 |
| mtaylor | ChangeLog diffviewer Makefile.am scmtools urls.py | 01:14 |
| mtaylor | conf djblets manage.py server.sh utils | 01:14 |
| mtaylor | configure.ac htdocs NEWS settings_local.py.tmpl webapi | 01:14 |
| mtaylor | which I find _exceptionally_ odd | 01:14 |
| lifeless | externals perhaps ? | 01:15 |
| jelmer | yup, externals | 01:16 |
| jelmer | mtaylor: bzr-svn doesn't support externals yet | 01:16 |
| mtaylor | aha | 01:16 |
| mtaylor | stupid svn people and their externals :) | 01:16 |
| lifeless | abentley: still around ? | 01:53 |
| abentley | I can answer a quick one. | 01:53 |
| lifeless | when we load a non rich roots inventory, is inv.root.revision set correctly? | 01:53 |
| lifeless | that is, is it set == inv.revision | 01:54 |
| abentley | I remember working on that, so I'd expect so. | 01:54 |
| === bigdog_ is now known as bigdog | ||
| dlee | I know we don't yet have line-ending stuff in bzr, but is there any way to get CRLF line endings from cvsps-import, or is that strictly an issue of what cvsps itself puts out? I think it might be in Bazaar territory because --use-cvs doesn't change anything, and without it, | 03:08 |
| dlee | I think Bazaar uses direct RCS access. | 03:08 |
| fullermd | It pretty much takes what comes out of the RCS files. | 03:08 |
| dlee | ...and RCS includes in its spec (or at least CVS does) that line endings should be LF only. | 03:09 |
| dlee | CVS converts per OS on checkout. | 03:09 |
| dlee | Interestingly, I got expected behavior (OS-proper endings) using Tailor, but cvsps-import gave me LF-only everywhere. | 03:10 |
| dlee | and Tailor missed all my CVS tags. :P | 03:10 |
| fullermd | One guess is because tailor checks out the files into a tree to work on, while cvsps-import just captures the file versions from stdout. | 03:13 |
| dlee | Hmm... but I'd think stdout would be OS-translated too... so is this even sensibly addressable in Bzr or cvsps-import, or would it have to be in cvsps? Or somewhere else... maybe a cvsps wrapper that converts line endings--but that sounds dangerous without knowledge of file types etc... | 03:17 |
| fullermd | cvsps just synthesizes the changesets. cvs or co is used to get the file versions. | 03:17 |
| dlee | My cvs checks out with CRLF though; this is why I'm surprised --use-cvs didn't help. | 03:19 |
| fullermd | Yeah, but co'ing a dir tree doesn't necessarily give you the same thing as 'co -p'ing a file version to stdout. | 03:20 |
| winzo_ | I'm trying to capture bzr output test for use within a bash script. I've tried several things and googling proved fruitless. Anyone know what I'm missing? | 03:20 |
| winzo_ | text* | 03:20 |
| dlee | I can test that anyway; it's a good start. Thanks much. :) | 03:21 |
| winzo_ | i.e., echo " $( bzr update ) " > myfile | 03:22 |
| dlee | (I have some 40 projects I want to talk my company into moving from CVS to Bazaar, and they're all in CVS; so the plan is to come up with a nice clean conversion plan, then pull it off, and then start demonstrating pros :) | 03:22 |
| spiv | winzo_: just "bzr update > myfile", surely? | 03:23 |
| winzo_ | You'd think so. But it didn't work. | 03:23 |
| winzo_ | A newline char gets written, though. :? | 03:23 |
| dlee | What command are you using for your test? (bzr command I mean) | 03:24 |
| spiv | Possibly "bzr update > myfile 2>&1" then. | 03:24 |
| spiv | (to capture stderr as well as stdout) | 03:24 |
| dlee | that's where I was heading... | 03:24 |
| winzo_ | That was it! Looks like I was re-directing wrong. :D | 03:25 |
| winzo_ | Thanks guys! | 03:25 |
| indu | how to install webserve | 03:28 |
| dlee | fullermd: cvs update -p produces CRLF here. Does --use-cvs literally make cvsps-import run the cvs command on my path? | 03:31 |
| fullermd | AFAIK. | 03:34 |
| dlee | Filing a bug for lack of a better idea... | 03:37 |
| indu | could some one please help in installing webserve | 03:39 |
| lifeless | indu: If I can make a suggestion. Ask specific questions. | 03:46 |
| lifeless | indu: e.g. 'When I XXX YYY happens' | 03:46 |
| ubotu | New bug: #181161 in bzr-cvsps-import "Line endings go from CRLF to LF under Cygwin, but not with Tailor" [Undecided,New] https://launchpad.net/bugs/181161 | 03:56 |
| lifeless | dlee: have you tried without cygwin? cyginw does some file mode seting magic | 03:59 |
| dlee | I don't happen to have a non-Cygwin cvsps, though I do have a non-cygwin cvs I think. | 04:00 |
| indu | lifeless, i am not knowing the procedure of installing webserve | 04:02 |
| indu | lifeless, i have seent he docs folder of the webserve source, where there is a README.txt file, which is giving information about how to configure webserve | 04:03 |
| indu | which is to be done after the installation, of webserve, and no info about the installation procedure | 04:03 |
| indu | its in python coding | 04:04 |
| spiv | indu: the README.txt has a section titled "Install" | 04:05 |
| indu | spiv, yeah, its in the last line of the README, I am sorry, i missed seeing it. thanks | 04:06 |
| indu | spiv, but without knowing this, i have done the copying of the webserve into the plugins fodler | 04:06 |
| indu | and then I have done the proper configurations also in the apache.conf file | 04:07 |
| indu | then I started webserve, using #bzr webserve --port=9099 "Official repository" http://localhost:9099/bazaar/ | 04:07 |
| indu | now, when I am trying to access the http://localhost:9099/bazaar, its displaying nothing on the browser | 04:08 |
| indu | Unbale to connect | 04:08 |
| spiv | Running "bzr webserve ..." has no relation to Apache AFAICT. | 04:09 |
| spiv | i.e. you run that command to run it as a standalone server. | 04:10 |
| indu | spiv, now i have dont the all the explained configurations, and when i am accessing, through http://localhost/bazaar, my apache error.log is showing the mesage as | 04:29 |
| indu | http://pastebin.com/m6e80c8b0 | 04:29 |
| spiv | indu: it sounds like you don't have bzrlib properly installed | 04:36 |
| lifeless | woot, it pulls | 04:37 |
| spiv | indu: oh actually, that looks like a bug in the webserve plugin | 04:37 |
| spiv | indu: put "import bzrlib.commands" in the webserve plugin's __init__.py | 04:38 |
| spiv | indu: or just change the line that says "import bzrlib" to say "import bzrlib.commands" | 04:39 |
| indu | any idea about this error message | 04:42 |
| dlee | If I do bzr send ... > outfile, then email outfile to a committer, (I) is this the best way to submit code changes where I can't commit/push, and (II) can the committer select among my (possibly multiple) commits in outfile easily and apply at will, in whole or in part? | 04:47 |
| spiv | dlee: (why not just run "bzr send", and let it start the email client for you?) | 04:48 |
| dlee | I'm afraid so far my emailings of this sort have just been typo fixes in comments, but I assume those are still of use. | 04:48 |
| spiv | dlee: yes, that's a good way to give your changes to someone else | 04:49 |
| dlee | Hehehe, good idea but this box isn't set up very well for that. This is Windows+Cygwin without Windows mail or well-configured Cygwin SMTP... mea culpa :) | 04:49 |
| spiv | dlee: they get all the revisions that you added, so they can do with them everything you can locally | 04:49 |
| spiv | dlee: including examine individual revisions, etc. | 04:49 |
| spiv | dlee: ah, I see :) | 04:49 |
| indu | spiv, yeah, now i can see something in my browser, but an error message, saying section not found | 04:50 |
| dlee | Cool...because one thing I just saw involves a misspelled class name, and the author may wish not to mess with that | 04:50 |
| indu | where as I have the repositories in the approprate lcoation | 04:50 |
| spiv | indu: I'd guess there's a problem with the configuration file for webserve, but I have no experience with that myself. | 04:51 |
| spiv | indu: so I can't offer much help on that | 04:51 |
| fullermd | Of course, if they cherrypick revs, you lose the identity. But if upstream is in CVS anyway, it hardly matters... | 04:52 |
| dlee | There must be a way to grab --mail-to from bzr log or somesuch though... | 04:52 |
| spiv | fullermd: yeah, but "bzr send" doesn't make that situation any better or worse. | 04:53 |
| dlee | Oh this is for Bazaar plugins actually. I don't know Python (yet), so the best I can do so far is to send typo fixes while I read code and docs... | 04:53 |
| fullermd | Yeah. `send` is uninvolved in that part of the process. | 04:53 |
| indu | anyone else there, who can help me in this please | 04:54 |
| dlee | I read with a talking computer, and it seems to catch types of spellos that more easily escape the eye... if you type "Don't forget you hat," I'll catch it right quick; but if you type "Seems theirs a bug here," I won't... | 04:54 |
| fullermd | Whereas that latter instantly grabs my eye and makes me want to beat the perpetrator with a 2x4 :p | 04:57 |
| dlee | hehehe | 04:57 |
| indu | hmm, there seem to be a mistake in the my webserve conf file, could some one please correct it, http://pastebin.ca/846269 | 05:03 |
| ubotu | New bug: #181165 in bzr-webserve ""import bzrlib" should be "import bzrlib.commands"" [Undecided,New] https://launchpad.net/bugs/181165 | 05:05 |
| spiv | indu: it would help to also tell people what the error you are getting is. | 05:05 |
| indu | spiv, my error is on the browser only, and it has lot of details, i think i can take a screenshot and send, any site where I can upload the screenshots images | 05:07 |
| indu | in simple, my Error messages on my browser says that ,, section not found: None | 05:08 |
| indu | Section Not found | 05:08 |
| indu | no one here, who can provide me help in webserve ? | 05:13 |
| dlee | Spiv: fwiw, bzr send direct to email now works here--nicer indeed. I may be the only Windows user using Mutt though.... | 05:13 |
| spiv | dlee: :) | 05:13 |
| fullermd | Well, surely there's at least one other sensible Windows users in the wor... no, you're probably right. | 05:21 |
| dlee | fullermd :) | 05:22 |
| dlee | fullermd: btw, I tried checking through cvs-import code, and now I wonder if subprocess.popen() is capable of being told something that might help with the line ending conversion issue--but that's a taller stack of stuff to paw through than I want to start tonight... | 05:24 |
| fullermd | Well, that's waay over my head :) | 05:26 |
| dlee | Does the cvs-import guy come in here? | 05:29 |
| fullermd | Oh, yes, he's in here most days. But he's in my TZ; it's almost midnight now. | 05:34 |
| fullermd | He's usually here during the day (say, 1500-2300Z). | 05:35 |
| dlee | Nick? | 05:35 |
| fullermd | jam or jam-laptop or some such. | 05:36 |
| fullermd | The list would probably also be a good place to check. | 05:37 |
| dlee | Since I submitted a bug on the cvsps-import line ending issue, if I do manage a code fix that works in my strange environment, would I be better to send it to Jam or somehow paste or attach it into the bug report? | 05:50 |
| spiv | dlee: you can attach patches to bugs | 05:52 |
| spiv | dlee: or even upload a branch to launchpad and link it to the bug. | 05:52 |
| dlee | Ah, the former doesn't surprise me but I didn't spot how to do it; the latter is beyond me to date... | 05:53 |
| dlee | but sounds cool | 05:53 |
| jamesh | dlee: you can add attachments in followups to a bug report | 05:54 |
| jamesh | we don't currently have a way to create an attachment when the bug is filed. | 05:54 |
| dlee | jamesh: gotcha; explains how I missed it. | 05:58 |
| mtaylor | jelmer: you around? is there any way to do an svn import do that svn tags show up as bzr tags and not bzr branches? | 06:10 |
| fullermd | svn has tags? ;) | 06:12 |
| jamesh | fullermd: as much as they have branches ... | 06:14 |
| indu | no help in webserve i can get here? | 06:39 |
| lifeless | indu: you've been getting help; its a shame it hasn't been enough to sort it all out yet. | 06:40 |
| lifeless | indu: I suggest mailing the list; goffredo reads the list and he knows all about webserve | 06:40 |
| fullermd | lifeless: Oh, hey, it just mentally penetrated that you're fiddling with inventories... | 06:42 |
| fullermd | lifeless: How amenable is our current setup and/or your work to referencing unchanged files? | 06:43 |
| lifeless | fullermd: EPARSE | 06:46 |
| mtaylor | is svn2bzr still in work? or has bzr-svn pretty much supplanted it? | 06:46 |
| fullermd | lifeless: `bzr ci --unchanged -m'foo' asdf.c ; bzr log --limit=1 asdf.c (check for 'foo')` | 06:46 |
| lifeless | fullermd: it won't record that | 06:47 |
| lifeless | fullermd: a new version of asdf.c isn't recorded, nor does the metadata about it change. | 06:47 |
| fullermd | Does it require major surgery to do so? | 06:48 |
| lifeless | yes | 06:48 |
| lifeless | whats the use case | 06:48 |
| fullermd | Conversions, for one thing. Forced commits are very common in the CVS world for making notes on files (updating incorrect commit messages, etc) | 06:48 |
| fullermd | Losing that information would make 'log $FILE' misleading at best. | 06:49 |
| fullermd | And with --unchanged existing in bzr, one can imagine doing similar things; if we need --unchanged, we can just as well need to reference files in it, and having 'log' not show those revs would be Wrong. | 06:49 |
| lifeless | so two things | 06:50 |
| lifeless | conversions | 06:52 |
| lifeless | hmmm | 06:52 |
| fullermd | Of course, the very thought of "high fidelity CVS conversion" is giggle-inducing. | 06:52 |
| fullermd | But still. | 06:53 |
| lifeless | I think this is worth raising; the conversion argument is not strong - because the upshot of that argument is being a usperset of everything, good bad and ugly | 06:54 |
| fullermd | Just a thought; ISTM that it's something we otter be able to represent, so as long as we're rototilling inventory handling anyway it's a capability to bear in mind. | 06:54 |
| lifeless | the argument about 'what is --unchanged for' is however really good | 06:54 |
| lifeless | if --unchanged is to allow logging extra information, there's no good reason you can't tickle some files in passing | 06:54 |
| lifeless | we can represent a new change in the per file graph in the current disk format | 06:55 |
| lifeless | the surgey is in the commit code is all | 06:55 |
| lifeless | and in UI, to diferentiate between 'selecting' and 'annotating' | 06:55 |
| fullermd | 'k. Should I file a bug, or open up a list discussion? | 07:04 |
| lifeless | discussion i think | 07:04 |
| * fullermd nods. | 07:04 | |
| fullermd | Good 'nuff. Thanks. | 07:05 |
| === asac_ is now known as asac | ||
| === bitmonk_ is now known as bitmonk-sharp | ||
| jelmer | mtaylor: No, bzr-svn doesn't support creating tags yet, that's an open bug. | 11:59 |
| === mrevell is now known as mrevell-lunch | ||
| === mrevell-lunch is now known as mrevell | ||
| === cprov is now known as cprov-lunch | ||
| === radix__ is now known as _radix | ||
| === cprov-lunch is now known as cprov | ||
| ignas | hi | 17:45 |
| ignas | how do i release a lock on a launchpad repository ? | 17:46 |
| ignas | i have lost the connection during the initial stage of a push | 17:46 |
| LarstiQ | ignas: tried bzr break-lock <remote/url> | 17:46 |
| ignas | thanks | 17:47 |
| samiam | hi all | 18:12 |
| samiam | quick question | 18:13 |
| samiam | I was trying to install bzr v1.0 onto a ubuntu feisty install and I am getting the following error "Failed to fetch http://bazaar-vcs.org/releases/debs/feisty/./Packages.gz MD5Sum mismatch" | 18:14 |
| samiam | does anyone have an idea if it is possible for me to fix this on my end or must I wait for changes at the bazaar site? | 18:14 |
| samiam | there is the obvious alternative that I can install from source, but I liked being able to apt-get the newest release... it will significantly beat version .15 that I have now | 18:15 |
| Odd_Bloke | samiam: What did you add to your sources.list? | 18:17 |
| luks | I don't see the actual deb files for feisty there | 18:17 |
| samiam | Odd_Bloke: deb http://bazaar-vcs.org/releases/debs/feisty ./ | 18:17 |
| luks | but you can use http://launchpad.net/~bzr/+archive which seems to have them | 18:17 |
| samiam | I followed the instructions provided on http://bazaar-vcs.org/DistroDownloads | 18:18 |
| samiam | thanks luks | 18:21 |
| samiam | looks like getting it from launchpad works properly | 18:21 |
| mtaylor | BAH! The link from bazaar-vcs.org should be changed to the PPA | 18:23 |
| jelmer | mtaylor: Well, PPA doesn't build stuff for feisty and dapper yet afaik... | 18:25 |
| elmo | jelmer: sure it does? | 18:25 |
| elmo | oh, rather, PPA itself can | 18:25 |
| elmo | the packaging would probably need altered to be able to build on all those | 18:25 |
| mtaylor | jelmer: I see bzr packages for dapper-gutsy | 18:25 |
| jelmer | elmo: oh, ok. when was that added? | 18:26 |
| jelmer | elmo: last time we discussed this (a bit before the holidays iirc) PPA supported only gutsy and hardy | 18:27 |
| elmo | jelmer: don't know actually, someone only pointed it out to me in the last week or so | 18:27 |
| === mw is now known as mw|food | ||
| thumper | is there any way I can ask a branch what locks it has? | 19:18 |
| === mw|food is now known as mw | ||
| Peng | thumper: I think 'bzr status -v' gives some information. | 19:26 |
| thumper | Peng: ta | 19:27 |
| thumper | Peng: it seems that status requires a working tree | 19:28 |
| thumper | Peng: which I don't have | 19:28 |
| statik | hi! | 19:28 |
| statik | if I want to convert a subversion repository to bazaar | 19:28 |
| Peng | thumper: Sorry, I meant info, not status. | 19:28 |
| statik | and I have a lot of tags in my subversion repo (from every nightly build), what is the best way to get that tag info into bazaar without importing every single tag branch? | 19:29 |
| thumper | Peng: oh, ok, it isn't showing anything about locks | 19:29 |
| Peng | thumper: Even with -v? | 19:29 |
| thumper | yeah | 19:29 |
| thumper | morning statik | 19:30 |
| statik | hey there thumper | 19:30 |
| === cfbolz_ is now known as cfbolz | ||
| === mwh___ is now known as mwh | ||
| dlee | Ok I'm *sure* I'm missing the obvious this time, but... if I have 320 revs in my local branch but I need to undo just revision 313, how do I do it? I'm used to applying what amounts to a reverse patch, then committing rev 321... but I've never done it in Bazaar. | 20:13 |
| LeoNerd | You can merge it in reverse | 20:16 |
| LeoNerd | bzr merge -r 313..312 | 20:16 |
| Peng | Might need to use: bzr merge -r 313..312 . | 20:17 |
| Peng | (with the . at the end) | 20:17 |
| dlee | Ah... I hadn't put the . for merge branch, so I was getting an error. Why does "bzr merge -c313 ." say "all changes applied successfully" but appear to do nothing at all? (Granted that was an experiment...) | 20:21 |
| Odd_Bloke | dlee: Check 'bzr status'. | 20:23 |
| dlee | Odd_Bloke: I must be fine; "bzr status --versioned" is empty. | 20:25 |
| dlee | ...and "bzr diff" is also empty. | 20:26 |
| dlee | Peng: Worked, thanks. | 20:26 |
| fullermd | dlee: '-c313' means '-r312..313', not '-r313..312'. And it's expected to do nothing, since it's an attempt to merge something you already have. | 21:17 |
| dlee | fullermd: That was my guess, but I experimented to see if it would figure out (from having nothing to do otherwise) that I wanted to go the other way. :) I was just surprised it said nothing about it, except to indicate success at doing nothing. | 21:19 |
| dlee | Is there a shortcut for reversing just one revision? I think subversion would do -C313. That was confusing to me when I saw it, but I'm slipping Bazaar methods into a project hand-over report and making them look as easy as pie so people might start liking Bazaar as much as I do. :) | 21:20 |
| dlee | -r313..312 is good enough otherwise. | 21:20 |
| Peng | hg has a backout command. | 21:25 |
| === bitmonk_ is now known as bitmonk-sharp | ||
| dlee | peng: Could be done pretty quick with a plugin I bet. | 21:39 |
| Peng | Probably be done with an alias. | 21:45 |
| Peng | What the heck? | 21:46 |
| Peng | .bzr/repository.backup? | 21:46 |
| lifeless | hmm, side effect of a failed upgrade most likely | 21:48 |
| Peng | I didn't know anything other than '.bzr.backup' was used. | 21:48 |
| Peng | I ran a 'find' and upgrade to pack-0.92 to upgrade branches a couple days ago. | 21:48 |
| Peng | Repos were already updated. | 21:48 |
| Peng | There was only a 'repository.backup' directory, no 'repository' directory. | 21:48 |
| mtaylor | hey guys - given a MergeDirective - what's the best way to get a list of revisions contained within it | 21:49 |
| Peng | And a .bzr.backup was created. | 21:49 |
| mtaylor | I'm guessing I want to get deserialize the MergeDirective.bundle, right? | 21:49 |
| lifeless | Peng: strange; care to file a bug with any info you can think of that might be relevant? | 21:49 |
| Peng | Ok. | 21:50 |
| Peng | Very little info though. | 21:50 |
| mtaylor | ah... found it | 21:51 |
| Peng | Bug 145812, perhaps? | 21:52 |
| ubotu | Launchpad bug 145812 in bzr "Upgrade can leave a broken repository (with backup)" [Low,Triaged] https://launchpad.net/bugs/145812 | 21:52 |
| lifeless | Peng: so the repository is not working at all ? | 21:53 |
| Peng | I renamed it back to 'repository' and it's fine. | 21:53 |
| poolfool | I have been using bzr under linux for a while now, I am now trying to get a National Instruments (NI) LabView (LV) project under revision control with bzr (1.0.0); my project directory has sub directories with whitespace (proj/a sub proj). This seems to cause problems when I try to branch. | 21:54 |
| poolfool | I get the error "bzr: ERROR: Not a branch: "C:/Documents and .../Desktop/proj/a sub proj". what am I doing wrong? Does bzr on Microsoft Windows not handle whitespace as well? | 21:55 |
| lifeless | it should | 21:56 |
| GaryvdM | is "proj/a sub proj" the dir you are branching from, or to? | 21:58 |
| poolfool | Just for a point of refrence, 'bzr branch "proj" "proj.a"' works fine ... | 21:58 |
| poolfool | important ... note the ' " ' | 21:58 |
| poolfool | GaryvdM: branching from | 21:59 |
| GaryvdM | And if you go into that dir, is there a hidden directory called .bzr? | 22:00 |
| poolfool | GaryvdM: So ... on a linux machine what I think I would type is "bzr branch proj/a\ sub\ proj proj/a\ sub\ proj.b" | 22:00 |
| Peng | Ah ah. | 22:00 |
| Peng | I just checked .bzr.log. | 22:01 |
| Peng | It is the bug I mentioned earlier. | 22:01 |
| poolfool | GaryvdM: Under 'proj' there is a folder .bzr; under the folder 'proj' "bzr status" returns nothing. ie. every file in there (including 'a sub proj') are under bzr control. | 22:01 |
| GaryvdM | on windows what you would type is: bzr branch "proj\a sub proj" "proj\ a sub proj.b" | 22:02 |
| Peng | lifeless: Comment? | 22:03 |
| GaryvdM | I think your branch is "proj" - not "proj\a sub proj" | 22:03 |
| lifeless | Peng: what bug earlier ? | 22:04 |
| Peng | Bug 145812. | 22:04 |
| ubotu | Launchpad bug 145812 in bzr "Upgrade can leave a broken repository (with backup)" [Low,Triaged] https://launchpad.net/bugs/145812 | 22:04 |
| Peng | You triaged it a few months ago. :) | 22:04 |
| poolfool | GaryvdM: Yep ... I was trying to branch an individual sub directory in the project ... not the whole project. My Bad. | 22:04 |
| Peng | Trivial to reproduce. | 22:04 |
| Peng | bzr init --pack-0.92-subtree; bzr upgrade | 22:05 |
| lifeless | ok | 22:05 |
| lifeless | I have no browser right now, will check it later | 22:05 |
| Peng | You don't have a browser open? | 22:05 |
| lifeless | nope | 22:06 |
| lifeless | performance testing | 22:06 |
| lifeless | need the memory for cache | 22:06 |
| Peng | Ah. | 22:07 |
| Peng | With that 20-second commit I do with hg, when Firefox is really chewing RAM, it can take over a minute. :) | 22:08 |
| lifeless | yah | 22:08 |
| ubotu | New bug: #181367 in bzr "bzr update should work in a treeless bound branch" [Undecided,New] https://launchpad.net/bugs/181367 | 22:26 |
| poolie | good morning | 22:47 |
| statik | hello! when I try to run bzr qcommit under gnome (ubuntu 7.10 gutsy), I get a window with no window decoration. When I run qtconfig, I get normal looking window decoration. Do I need to do anything special to make qbzr get window decoration? | 23:05 |
| jelmer | statik: luks is the person you would want to talk to, when he's around | 23:16 |
| statik | jelmer: ok, thanks | 23:16 |
| statik | I did try just a very simple pyqt application, and I get window decoration | 23:16 |
| statik | and I don't see any errors in ~/.bzr.log | 23:16 |
| jelmer | lifeless: Now that PPA supports Dapper, Edgy and Feisty, do you have any plans to move the bazaar-vcs.org debian repo to PPA or would you rather keep it separate because of the signing? | 23:23 |
| mtaylor | statik: the best way to fix that is to use pygtk | 23:26 |
| statik | mtaylor: did you know qbzr already has the commit message save and restore in it? | 23:26 |
| mtaylor | really? | 23:26 |
| statik | yep | 23:26 |
| mtaylor | SWEET | 23:26 |
| statik | you'll need to modify it to handle per-file commit messages, but that should be not so hard | 23:27 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!