| *** goschtl has joined #zope | 00:06 | |
| *** goschtl has quit IRC | 00:08 | |
| *** goschtl has joined #zope | 00:09 | |
| *** goschtl has quit IRC | 00:25 | |
| *** J1m has quit IRC | 00:27 | |
| *** J1m has joined #zope | 00:28 | |
| *** J1m has quit IRC | 00:39 | |
| *** J1m has joined #zope | 00:44 | |
| *** m8 has quit IRC | 00:57 | |
| *** goschtl has joined #zope | 01:30 | |
| *** mcdonc is now known as mcdonc_ | 01:31 | |
| *** mcdonc_ is now known as mcdonc | 01:31 | |
| *** goschtl has quit IRC | 01:35 | |
| *** supton has joined #zope | 02:04 | |
| *** alket has joined #zope | 02:16 | |
| alket | does zope.interface differs from zope ? | 02:16 |
|---|---|---|
| Arfrever | alket: Read http://docs.zope.org/zopetoolkit/about/index.html | 02:20 |
| Arfrever | alket: zope.interface belongs to Zope Toolkit. | 02:21 |
| alket | thank you | 02:21 |
| alket | how can I install zope.interface in CentOS 5 ? | 02:21 |
| Arfrever | alket: http://docs.zope.org/zopetoolkit/releases/packages-trunk.html contains the list of libraries in Zope Toolkit (and some dependencies). | 02:22 |
| alket | but all the downloads are for windows | 02:22 |
| Arfrever | alket: Maybe a package manager used in CentOS provides zope.interface. | 02:23 |
| alket | by installing zope, does zope.interface comes with it | 02:23 |
| Arfrever | alket: How do you install Zope? Which version of Zope? | 02:24 |
| alket | http://dl.fedoraproject.org/pub/epel/5/i386/repoview/zope.html | 02:24 |
| Arfrever | alket: http://pypi.python.org/pypi/zope.interface/3.8.0 contains source tarball. | 02:24 |
| alket | I don't know how to install it | 02:25 |
| Arfrever | alket: Why do you use CentOS? | 02:26 |
| alket | It is not mine, its hosted on Godaddy, one client wanted to install it, basicly Im doing a favor since I am web dev | 02:26 |
| Arfrever | alket: You might manually install zope.interface using `${python} setup.py install`. | 02:27 |
| alket | really , thank you | 02:27 |
| *** J1m has quit IRC | 02:27 | |
| alket | it doesn have something like , make , make install ? | 02:27 |
| Arfrever | alket: http://docs.python.org/install/index.html | 02:28 |
| *** J1m has joined #zope | 02:30 | |
| *** J1m has quit IRC | 02:30 | |
| alket | thank you Arfrever | 02:33 |
| *** _mup_ has quit IRC | 03:00 | |
| *** _mup_ has joined #zope | 03:00 | |
| *** supton has quit IRC | 03:17 | |
| *** ccomb has quit IRC | 03:32 | |
| *** supton has joined #zope | 04:07 | |
| *** Arfrever has quit IRC | 05:12 | |
| *** alga has quit IRC | 05:14 | |
| *** mcdonc has quit IRC | 05:24 | |
| *** mcdonc has joined #zope | 05:25 | |
| *** alket has quit IRC | 06:52 | |
| *** andreypo_ has joined #zope | 07:07 | |
| *** davetoo has joined #zope | 07:32 | |
| *** davetoo has left #zope | 07:59 | |
| *** supton has quit IRC | 08:28 | |
| *** davetoo1 has joined #zope | 09:06 | |
| *** davetoo1 has left #zope | 09:14 | |
| *** goschtl has joined #zope | 09:19 | |
| *** zagy has joined #zope | 09:24 | |
| *** goschtl has quit IRC | 09:27 | |
| *** goschtl has joined #zope | 09:28 | |
| *** menesis has joined #zope | 10:28 | |
| *** m8 has joined #zope | 10:30 | |
| *** goschtl has quit IRC | 11:01 | |
| *** schaueho has joined #zope | 12:42 | |
| *** hever has joined #zope | 14:09 | |
| *** alga has joined #zope | 14:14 | |
| *** ccomb has joined #zope | 14:37 | |
| *** J1m has joined #zope | 14:49 | |
| *** schaueho has quit IRC | 15:09 | |
| *** menesis has quit IRC | 15:20 | |
| *** mr_jolly has joined #zope | 15:24 | |
| *** ccomb has quit IRC | 16:21 | |
| *** alexpilz has joined #zope | 16:29 | |
| *** J1m has quit IRC | 16:40 | |
| *** alexpilz has quit IRC | 16:52 | |
| *** J1m has joined #zope | 17:01 | |
| *** J1m has quit IRC | 17:04 | |
| *** J1m has joined #zope | 17:22 | |
| *** frapell has quit IRC | 17:53 | |
| *** mr_jolly has quit IRC | 18:03 | |
| *** mr_jolly has joined #zope | 18:24 | |
| *** __mac__ has joined #zope | 18:26 | |
| J1m | anyone here know much about svn2git? | 18:57 |
| *** baijum has joined #zope | 19:03 | |
| J1m | baijum, do you know anything about svn2git? | 19:07 |
| baijum | J1m: I haven't used it before, any issues ? | 19:08 |
| J1m | It worked well last week before I had author info. | 19:08 |
| J1m | Now, with author info and after cleanups, it's missing most branches and tags. :( | 19:09 |
| J1m | I fear I messed up by cleaning up svn. | 19:09 |
| baijum | J1m: hmm... let me try to run it locally | 19:09 |
| J1m | getting it installed correctly is hard. | 19:10 |
| J1m | the version I'm using doesn't seem to be current. | 19:10 |
| baijum | J1m: I just got it installed, are you using svn:// or svn+ssh ? | 19:15 |
| J1m | good question. | 19:16 |
| J1m | I'm using svn+ssh today. | 19:16 |
| J1m | I think I used svn last week. | 19:16 |
| baijum | J1m: zc.buildout/tags/2.0.0a1 | 19:16 |
| baijum | there is an svn external ^^^ | 19:16 |
| baijum | which is svn+ssh | 19:16 |
| J1m | fwiw, I moved the ~/.svn2git/authors file aside and now it seems to be working harder...which may mean getting farther. :/ | 19:18 |
| baijum | J1m: I am changing svn+ssh externals inside that tags (it won't do any harm) | 19:19 |
| J1m | please don't | 19:19 |
| baijum | J1m: ok, fine | 19:20 |
| J1m | I'd rather wait and see what happens with the current experiment. | 19:20 |
| J1m | It's working much harder now, which is a good sign. :) | 19:20 |
| baijum | J1m: great :) | 19:21 |
| baijum | J1m: can you send that authors file to my email, I will try once from here | 19:21 |
| J1m | I'd rather you see if you can get a clean conversion without it. | 19:22 |
| baijum | J1m: ok, let me try | 19:23 |
| J1m | do you know much about git? | 19:23 |
| baijum | J1m: Just learning :) our company is on the process of migration... | 19:28 |
| J1m | crap | 19:30 |
| J1m | well, moving the author file aside gave me the same result I got last week. | 19:31 |
| J1m | cleaning up branches did no good. | 19:31 |
| J1m | I now have lots of branches. | 19:31 |
| J1m | Way more than I want. | 19:31 |
| J1m | I guess I can delete them in git. | 19:31 |
| baijum | J1m: Deleting later in Git would be better | 19:32 |
| baijum | J1m: we can ask people to fork the repo and maintain branch in their for if required | 19:33 |
| baijum | s/for/fork | 19:33 |
| baijum | J1m: I am just running this now: | 19:33 |
| baijum | git svn clone --authors-file=/home/baiju/authors.txt svn://svn.zope.org/repos/main/zc.buildout buildout | 19:33 |
| baijum | I added two sample authors | 19:34 |
| J1m | I wonder how svn clone differs from svn2git. | 19:34 |
| baijum | J1m: http://help.github.com/import-from-subversion/ | 19:34 |
| baijum | J1m: GitHub official document mention that.. | 19:35 |
| J1m | mention what? | 19:38 |
| J1m | That doc says that svn clone doesn't copy branches and tags. | 19:38 |
| J1m | But I think we want to copy branches and tags. | 19:39 |
| J1m | OK, well, at this point, I think I have 2 issues: | 19:39 |
| J1m | 1) Conversion w authors doesn't work. | 19:39 |
| J1m | 2) If I get it to work, I think I want to do some cleanup before pushing it to github. | 19:40 |
| J1m | I'll try adding missing authors (using svn.zope.org emails) and see if I can get conversion to work. | 19:40 |
| J1m | After that, I'd like some help with 2 from a git export. | 19:40 |
| baijum | J1m: AFAIK, git svn should handle branches also, I am trying now | 19:41 |
| J1m | Or maybe I'll just make some educated guesses. :) | 19:41 |
| baijum | J1m: I created an authors.txt by this shell script : http://technicalpickles.com/posts/creating-a-svn-authorsfile-when-migrating-from-subversion-to-git/ | 19:41 |
| J1m | The doc you pointed me to, which I'd read, said it doesn't, but maybe you'll prove it wrong. | 19:41 |
| baijum | J1m: the doc doesn't say anything about branches...let me try. Some link given below doesn't support it (that's mentioned) | 19:45 |
| J1m | "git-svn | 19:46 |
| J1m | git-svn can be used to import as well. Note that there may be issues if you have branches or tags (they won?t be imported over). If you only have a trunk, like many svn repositories, this method should work for you without issue." | 19:46 |
| baijum | J1m: yeah. I need to read carefully :) | 19:47 |
| *** Arfrever has joined #zope | 19:50 | |
| baijum | J1m: I used the -s option | 19:54 |
| baijum | and I got all branches | 19:54 |
| baijum | git svn clone -s -r 121327:HEAD --authors-file=/home/baiju/authors.txt svn://svn.zope.org/repos/main/zc.buildout buildout | 19:54 |
| baijum | that -r option should be removed, this only fetched latest | 19:55 |
| baijum | *fetches | 19:55 |
| baijum | This list all branches: $ git branch -r | 19:56 |
| J1m | I fricking hate gits pager. | 19:57 |
| J1m | I need to figure out how to disable it. | 19:57 |
| *** patrickzope has joined #zope | 19:59 | |
| J1m | how many branches did you get? | 19:59 |
| baijum | $ git branch -r|wc -l | 19:59 |
| baijum | 13 | 19:59 |
| J1m | and there are 18 branches in svn. | 20:00 |
| baijum | J1m: I used -r option, so it only fetched after r121327 | 20:01 |
| J1m | yeah, what branches did you get? | 20:01 |
| baijum | $ git branch -r | 20:01 |
| baijum | 1.4 | 20:01 |
| baijum | 2 | 20:01 |
| baijum | baijum-project-name-with-underscore | 20:01 |
| baijum | ctheune-buildout-parallelfetch | 20:01 |
| baijum | dist-cache | 20:01 |
| baijum | documentation | 20:01 |
| baijum | encolpe-escape-command | 20:01 |
| baijum | env-cache | 20:01 |
| baijum | newbery-multiple-increments | 20:01 |
| baijum | python-3-2 | 20:01 |
| baijum | ruda-meta-recipe | 20:01 |
| baijum | tags/2.0.0a1 | 20:01 |
| baijum | trunk | 20:01 |
| J1m | That's random. | 20:02 |
| J1m | what do you get from git tag? | 20:02 |
| *** v3rsus has joined #zope | 20:02 | |
| baijum | J1m: how to list tags ? | 20:03 |
| J1m | I know how to list tags: git tag | 20:03 |
| J1m | I was wondering what tags you got. | 20:03 |
| baijum | J1m: it's empty | 20:03 |
| J1m | which may or may not mean anything. | 20:04 |
| baijum | J1m: it looks like a branch is created, see the above list of branches: tags/2.0.0a1 | 20:04 |
| J1m | Right. svn2git actually creates tags. | 20:04 |
| J1m | You said you created an authors.txt from the script you saw on line. | 20:05 |
| baijum | yes | 20:05 |
| J1m | did you fill in missing emmails? | 20:05 |
| J1m | emails | 20:05 |
| baijum | J1m: I added mine and yours and other some junk, but it appears | 20:05 |
| J1m | ok, well, I have a better way to create an authors.txt, so I'll continue with that.... | 20:06 |
| baijum | J1m: If you send the authors.txt, I can try again with full repo | 20:06 |
| baijum | then I can push that to another repo in github for verification | 20:06 |
| J1m | for what purpose? | 20:07 |
| baijum | J1m: I can try to do the same and see if all names comes, | 20:07 |
| J1m | all what names? | 20:08 |
| baijum | all author names + emails | 20:08 |
| J1m | I don't see the point of that. | 20:08 |
| baijum | J1m: ok, fine | 20:09 |
| J1m | git-svn isn't handling tags correctly. | 20:09 |
| J1m | I'd rather try to make svn2git work. | 20:09 |
| J1m | But it's going to take me a few minutes to finish trying to fix up my author's list. | 20:09 |
| baijum | J1m: please continue... | 20:10 |
| *** v3rsus has left #zope | 20:10 | |
| J1m | ok, running again with hopefully good authors file | 20:21 |
| J1m | patrickzope, thanks for joing us | 20:21 |
| J1m | Here's the current state: | 20:21 |
| J1m | 1) Conversion w authors doesn't work. | 20:22 |
| J1m | 2) If I get it to work, I think I want to do some cleanup before pushing it to github. | 20:22 |
| J1m | I'm hoping conversion with authors didn't work because there were missing authors. | 20:22 |
| J1m | Hopefully, I fixed that. | 20:22 |
| patrickzope | okay. We're using svn2git? | 20:23 |
| J1m | yup | 20:23 |
| J1m | although baijum tried git-svn, which seemed to mostly work with a complete but junky authors file and didn't handle tags correctly. | 20:24 |
| J1m | baijum, could you send me your authors.txt file? | 20:24 |
| baijum | J1m: 1 sec | 20:25 |
| J1m | patrickzope, the result converted lots of old branches that were deleted in svn. | 20:25 |
| J1m | which is annoying. | 20:25 |
| J1m | I assume I can just delete them (git branch -d xxx) | 20:26 |
| J1m | It looks like when a git branch is deleted, it's unrecoverably removed from the repo and all it's uniq commits are removed. | 20:26 |
| baijum | J1m: send authors.txt | 20:26 |
| J1m | can you confirm that? | 20:27 |
| J1m | baijum, thanks | 20:27 |
| baijum | np | 20:27 |
| J1m | For this use case, it would be sort of good if "git branch -d" was that destructive (or maybe git branch -D) | 20:28 |
| baijum | J1m: I would suggest to delete branches after few days from remote, this will give committers a chance to fork entire repo with their branches | 20:28 |
| J1m | The branches I want to delete are branches that have already beed deleted from svn, either because they've been merged or because they were abandoned. | 20:29 |
| J1m | I won't delete any non-junk branches. | 20:29 |
| baijum | J1m: ok, fine | 20:29 |
| J1m | aside from cleaning up junk branches, I guess the only other questions is what to do w master. | 20:30 |
| patrickzope | J1m, my understanding is that if the branches were merged into trunk, the commit messages should be preserved. If they were never merged then deleting it will completely remove it from the repo (eventually when git garbage collects it) | 20:30 |
| J1m | OK, I think that confirms what I said, with the added bonus that meta data for merged branches is preserved even after the branch is deleted. | 20:33 |
| J1m | right? | 20:33 |
| patrickzope | right | 20:33 |
| J1m | cool, so I won't worry about the extra branches I get in the conversion process. | 20:34 |
| J1m | (The conversion process seems to be chugging along with the better authors file.) | 20:34 |
| J1m | so, me remaining question is what to do w master. | 20:34 |
| J1m | I assume master will end up pointing to svn trunk. | 20:35 |
| J1m | I think I just need to delete it and reset it to the 1.4 branch. | 20:35 |
| J1m | (I should have said "amongst the remaining questions :) | 20:36 |
| * J1m read some of "Pro Git" this weekend, which seems to be a pretty good git book. | 20:37 | |
| J1m | OK conversion completed. | 20:41 |
| J1m | I have lots of branches, and tags. | 20:41 |
| J1m | so now on to removing branches. I'll try a could by and and then convert to a script. | 20:42 |
| baijum | J1m: ah. nice | 20:43 |
| baijum | J1m: I am leaving...bye | 20:44 |
| J1m | k, thanks | 20:44 |
| *** baijum has left #zope | 20:45 | |
| J1m | patrickzope, any comment on what to do w master? | 20:47 |
| patrickzope | J1m: in what regard? I assume the conversion made the trunk master? You might be able to use git reset to make master point to the 1.4 branch | 20:52 |
| J1m | I was calling on your vast git experience to find out if what I was planning sounded right. :) | 20:54 |
| J1m | New development will proceed from the 1.4 branch, so that is going to be the new master. | 20:54 |
| patrickzope | heh, I wouldn't say my git experience is vast | 20:54 |
| patrickzope | okay | 20:54 |
| J1m | I moved master to svntrunk, for posterior. | 20:55 |
| J1m | I've checked out 1.4 | 20:55 |
| J1m | Now, I just need to (re-)create master branch there.... | 20:56 |
| J1m | bash-3.2$ git checkout -b master 1.4 | 20:58 |
| J1m | warning: refname '1.4' is ambiguous. | 20:58 |
| J1m | warning: refname '1.4' is ambiguous. | 20:58 |
| J1m | fatal: Ambiguous object name: '1.4'. | 20:58 |
| J1m | bash-3.2$ git checkout -b master 1.4 | 20:58 |
| J1m | warning: refname '1.4' is ambiguous. | 20:58 |
| J1m | warning: refname '1.4' is ambiguous. | 20:58 |
| J1m | fatal: Ambiguous object name: '1.4'. | 20:58 |
| J1m | damn xchataqua | 20:58 |
| J1m | 20:58 | |
| J1m | 20:58 | |
| J1m | bash-3.2$ git checkout -b master 1.4 | 20:59 |
| J1m | warning: refname '1.4' is ambiguous. | 20:59 |
| J1m | warning: refname '1.4' is ambiguous. | 20:59 |
| J1m | fatal: Ambiguous object name: '1.4'. | 20:59 |
| J1m | wtf | 20:59 |
| J1m | does git not like branch names like "1.4"? | 20:59 |
| patrickzope | I don't think that's the problem | 21:00 |
| patrickzope | what happens when you do "git show-ref | grep '1.4'" | 21:01 |
| J1m | I get lots of things. | 21:01 |
| J1m | 6410962b12dc477fd1b4e9dbd38c073c11f67a75 refs/heads/1.3 | 21:02 |
| J1m | e621a0ce3d0067747d1d7afb286127f14b8d27b1 refs/heads/1.4 | 21:02 |
| J1m | d092cea6e8a8bdf5a0c642a08194c2606418d128 refs/heads/svntrunk | 21:02 |
| J1m | 6d60de3cdb8f1a8b2b13483251b75fcd4a6c4378 refs/heads/sylvain-distribution-cache | 21:02 |
| J1m | 6410962b12dc477fd1b4e9dbd38c073c11f67a75 refs/remotes/1.3 | 21:02 |
| J1m | e621a0ce3d0067747d1d7afb286127f14b8d27b1 refs/remotes/1.4 | 21:02 |
| J1m | dece4b21c4c0024a1aa6777286124e8bae6720a2 refs/remotes/aclark-combine-egg-recipes | 21:02 |
| J1m | f9b9401c85eb57c77a27c0d3884b11d31948e4d5 refs/remotes/amos-dependency-links | 21:02 |
| J1m | ddc4dbb7b9a234134b26de15fe765b57b55a0acf refs/remotes/gary-1-minor-cleanup | 21:02 |
| J1m | fa6a7da4d8174da8e8cb42a7a7b61b87662bad4a refs/remotes/gary-1.5.2 | 21:02 |
| J1m | 9ed408ecd574dc263b5072601b164dce72f6e73d refs/remotes/gary-7 | 21:02 |
| J1m | 362ec1161b423fe0560f8093a472015d85c626ef refs/remotes/gary-8-hack-fix | 21:02 |
| J1m | 95719f46e22e2d7ed8fe668a1040fa05126f4145 refs/remotes/gary-launchpad | 21:02 |
| J1m | 144f644dd58d84033cf9c3ed732e547afb76e502 refs/remotes/plus-minus-option-syntax-for-review | 21:02 |
| J1m | a54c1e3d4910454036e93d4df817a9b1aaed8e49 refs/remotes/prefer-final | 21:02 |
| J1m | 0b7b6ed4e8bff19414347aa555d437e9ef0bf8df refs/remotes/python-3-2 | 21:02 |
| J1m | 61aaccd855790efaeba29b2ce02878973c143174 refs/remotes/python-support | 21:02 |
| J1m | 56fa5f3a31a404c376a10fbcd60f04512cb69f38 refs/remotes/ruda-meta-recipe | 21:02 |
| J1m | 6d60de3cdb8f1a8b2b13483251b75fcd4a6c4378 refs/remotes/sylvain-distribution-cache | 21:02 |
| J1m | fe1540625586f6154436acc50b0bc29780e99b97 refs/tags/1.0.0b22 | 21:02 |
| J1m | cc506618459d38817497ecb483220ccce398edc1 refs/tags/1.0.0b26 | 21:02 |
| J1m | f9acc1ccfd449bb9184a54d3b2db6cedbe20dd47 refs/tags/1.0.1 | 21:02 |
| J1m | a4ab164dfbfa349a71d030bfd5037db0a129a186 refs/tags/1.0.6 | 21:02 |
| J1m | 53e32880501a434a65fdaee522c392f3f5055b09 refs/tags/1.4.0 | 21:02 |
| J1m | f34fae28f2bc8d4ab56e57a8ec03b998bde2c3f5 refs/tags/1.4.1 | 21:02 |
| J1m | ad305b5fea71c3073cac0d5b4af6ef4ec67439a6 refs/tags/1.4.2 | 21:02 |
| J1m | bdd10ef52301e261b47bb0bcfc8ca1da23b732f6 refs/tags/1.4.3 | 21:02 |
| J1m | 7eff57a9c92439c23a3df4a0e8dc4e64ac1d4bef refs/tags/1.4.4 | 21:02 |
| J1m | 194a1dfcb709aa2be2a90bf881d481b45d9ccdf9 refs/tags/egg-1.0.0b3 | 21:02 |
| J1m | what is a ref? | 21:02 |
| J1m | Note that:bash-3.2$ git checkout 1.4 | 21:04 |
| J1m | warning: refname '1.4' is ambiguous. | 21:04 |
| J1m | Switched to branch '1.4' | 21:04 |
| J1m | sort of works. | 21:04 |
| *** andreypo_ has quit IRC | 21:05 | |
| patrickzope | refs are pointers to branches | 21:05 |
| J1m | um | 21:06 |
| patrickzope | did svn2git provide a --prefix option? | 21:06 |
| J1m | no | 21:07 |
| J1m | bash-3.2$ git branch | 21:07 |
| J1m | 1.3 | 21:07 |
| J1m | * 1.4 | 21:07 |
| J1m | 2 | 21:07 |
| J1m | baijum-project-name-with-underscore | 21:07 |
| J1m | ctheune-buildout-parallelfetch | 21:07 |
| J1m | davisagli-install-optimization | 21:07 |
| J1m | do3cc_exitcode | 21:07 |
| J1m | documentation | 21:08 |
| J1m | encolpe-escape-command | 21:08 |
| J1m | env-cache | 21:08 |
| J1m | faassen-develop | 21:08 |
| J1m | gotcha-scripts-warning | 21:08 |
| J1m | gotcha-timeout-cfg | 21:08 |
| J1m | help-api | 21:08 |
| J1m | newbery-multiple-increments | 21:08 |
| J1m | reinout-scripts | 21:08 |
| J1m | svntrunk | 21:08 |
| J1m | sylvain-distribution-cache | 21:08 |
| J1m | tlotze-download-hard-links | 21:08 |
| J1m | This doesn't look all that ambiguous. | 21:08 |
| J1m | I find the ambiguity ambiguous :) | 21:08 |
| J1m | bash-3.2$ git branch master | 21:09 |
| J1m | warning: refname '1.4' is ambiguous. | 21:09 |
| J1m | fatal: Ambiguous object name: '1.4'. | 21:09 |
| J1m | gaaaa | 21:09 |
| patrickzope | the ambiguity is that you have a remote tracking branch 1.4 in refs/remotes/1.4…usually that should be something like refs/remotes/origin/1.4, I believe. | 21:12 |
| J1m | I'm lost | 21:13 |
| J1m | I'm lost on sooo many levels. | 21:14 |
| *** zagy has quit IRC | 21:14 | |
| J1m | if 1.4 is ambiguous, why can I check it out? | 21:15 |
| J1m | Can I delete refs? | 21:15 |
| patrickzope | what happens when you specify the full path to 1.4? | 21:16 |
| J1m | I have no remotes at this point, so why do I have remote refs? | 21:16 |
| patrickzope | I think they are created during the conversion from svn | 21:17 |
| patrickzope | you can delete them I guess | 21:18 |
| J1m | bash-3.2$ git remote | 21:18 |
| J1m | bash-3.2$ git checkout refs/heads/1.4 | 21:18 |
| J1m | Note: checking out 'refs/heads/1.4'. | 21:18 |
| J1m | You are in 'detached HEAD' state. You can look around, make experimental | 21:18 |
| J1m | changes and commit them, and you can discard any commits you make in this | 21:18 |
| J1m | state without impacting any branches by performing another checkout. | 21:18 |
| J1m | If you want to create a new branch to retain commits you create, you may | 21:18 |
| J1m | do so (now or later) by using -b with the checkout command again. Example: | 21:18 |
| J1m | git checkout -b new_branch_name | 21:18 |
| J1m | HEAD is now at e621a0c... Avoid sorting the working set and requirements when it won't be logged. | 21:18 |
| J1m | bash-3.2$ git checkout refs/remotes/1.4 | 21:18 |
| J1m | HEAD is now at e621a0c... Avoid sorting the working set and requirements when it won't be logged. | 21:18 |
| * J1m is dumbfounded | 21:19 | |
| *** davetoo has joined #zope | 21:19 | |
| J1m | so, neither of those message is encouraging. | 21:20 |
| J1m | although I didn't get a warning about ambiguity. | 21:20 |
| J1m | I suppose I should create a new branch from one of them.....but which one? | 21:20 |
| davetoo | oops, did I type #git by mistake? | 21:21 |
| davetoo | :) | 21:21 |
| davetoo | </snicker> | 21:21 |
| J1m | very funny | 21:21 |
| davetoo | I am still confused by it sometimes, | 21:22 |
| J1m | any idea wtf: Avoid sorting the working set and requirements when it won't be logged. | 21:23 |
| davetoo | rather than figuring it out I just use the hash of the branch I want as the starting point rather than the reference | 21:23 |
| patrickzope | I think it's screwed up because we supplied a path to "git checkout" instead of just the branch name | 21:24 |
| patrickzope | the "ambiguous object reference" issue probably needs to be resolved first... | 21:24 |
| *** davetoo has left #zope | 21:25 | |
| J1m | BTW, that "Avoid sorting the working set and requirements when it won't be logged." is a check-in message. | 21:25 |
| J1m | But I resolved it by using a ref..... | 21:25 |
| J1m | Oh, so when I Itried checking out a ref, that message was just telling me to pound sand. | 21:27 |
| J1m | I was checking out a revision and wasn't on any btanch. | 21:27 |
| J1m | In fact, I was probably on the last revision in the repo. | 21:27 |
| patrickzope | I think if we can just move the remotes into remotes/origin it will solve some of the problems, but I'm not sure how to do that :) | 21:28 |
| J1m | I'm skeptical. | 21:28 |
| J1m | I'll eventually add the bitbucket repo as the origin remote. | 21:28 |
| patrickzope | then can we just delete those? I don't even know what they would point to | 21:29 |
| J1m | I have a feeling that these stupid refs are just getting in the way. | 21:29 |
| patrickzope | refs/remotes/* | 21:29 |
| J1m | That sounds promising. | 21:30 |
| patrickzope | git branch -rd | 21:30 |
| J1m | Yeah, the heads correspond to the branches I should have. | 21:31 |
| patrickzope | I need to head out, I'll check back in later | 21:33 |
| *** patrickzope has quit IRC | 21:34 | |
| *** __mac__ has quit IRC | 22:12 | |
| *** J1m has quit IRC | 22:33 | |
| *** J1m has joined #zope | 22:34 | |
| *** thetet has joined #zope | 22:44 | |
| *** J1m has quit IRC | 22:45 | |
| *** andreypo_ has joined #zope | 23:09 | |
| *** Marcker has joined #zope | 23:18 | |
| *** patrickzope has joined #zope | 23:20 | |
| *** patrickzope has quit IRC | 23:21 | |
| *** Marcker has quit IRC | 23:41 | |
| *** Marcker has joined #zope | 23:42 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!