IRCloggy #git 2007-05-31

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2007-05-31

jeffpc gitte: is there are list of options?00:00
jdl jdl.com 442 % git --version00:01
git version 1.5.2.136.g322bc00:01
Ahhh.... Much better...00:01
gitte jeffpc: since v1.4.2-rc2, we have pack.window and pack.depth, described in Documentation/config.txt.00:04
Both options can be provided directly to pack-objects, if you call that directly.00:04
jeffpc gitte: I'll just put it in .git/config :)00:05
gitte Oops. pack.depth was only introduced with 1.5.2-rc3.00:05
jeffpc is running latest git00:05
gitte And I think the documentation is wrong, I think we have higher defaults now.00:05
I need to get my eyes fixed. The documentation is correct.00:08
spearce version --list-features / --supports-feature=<name> away! ;-)00:18
gitte is watching Ron White: Can't fix stupid. Hilarious!00:23
mugwump http://www.selenic.com/mercurial/wiki/index.cgi/ForestExtension # interesting ... subprojects for mercurial00:29
→ DrNick joined00:34
gitte mugwump: somehow I find it more elegant to have it as subcommands...00:48
jasam good night gitte01:12
gitte Night, jasam!01:13
→ GeertB joined01:42
→ aroben_ joined01:51
→ orospakr joined02:27
→ spuk joined02:50
→ tko joined02:56
→ janm joined03:20
→ tko joined03:35
→ fhobia joined03:39
→ evan joined04:11
→ gitster joined04:11
→ tokkee joined04:11
→ davi joined04:11
→ jasonsewall joined04:14
→ tko joined04:21
→ rkaway1 joined04:27
→ tokkee_ joined04:33
→ tko joined04:36
→ evan joined04:45
→ gitster joined04:45
→ tokkee joined04:45
→ davi joined04:45
→ evan joined04:51
→ gitster joined04:51
→ tokkee joined04:51
→ davi joined04:51
→ aroben_ joined04:55
→ tko joined05:19
jasonsewall Can anyone here help me with svnimport?05:28
context jasonsewall: id recommend git-svn over svnimport05:30
jasonsewall Never heard of it - I'll take a look05:30
→ Pistahh joined05:38
→ devogon joined05:42
tokkee_ → tokkee05:50
→ Pistahh joined06:18
jasonsewall I've imported my SVN repo (with many projects); how do I break it up into several project-specific repos?06:20
→ Pistahhh joined06:23
→ etnt joined06:28
← jasonsewall left06:29
→ Pistahh joined06:39
→ eclesh joined06:55
→ rktour joined07:21
→ robinr joined07:56
→ segher joined08:01
→ Romster joined08:03
→ dkagedal joined08:36
→ fultilt joined08:57
→ jeffpc joined09:39
→ laj joined09:40
→ chris2 joined09:49
lu_zero gitweb doesn't cache requests?09:57
→ Roomster joined10:01
→ GyrosGeier joined10:09
← dduncan left10:25
→ Gitzilla_ joined10:25
→ hein joined10:31
hein → Sho_10:37
Roomster → Romster11:31
→ fonseca joined11:38
→ mike joined11:55
→ ferdy joined11:58
pigeon how should i set up a hook to auto bring in commits to branch A into branch B for a bare bone tree?12:30
kha pigeon: I'm not sure exactly. But in general it's not possible unless the branches are identical, since you could get merge conflicts that require a manual fixup.12:31
pigeon yeah i realize that, but say if i know branch B is branched off branch A, or even just master and a branch.12:33
at the moment i'm happy to know if there could be issues with an auto merge, for now i want to set it up so i can see, but i'm not sure how to.12:35
kha pigeon: Me neither. I've never tried to use hooks.12:39
pigeon ok12:39
i remember there was a git (cg) hook which auto merge on a push, which is also considered dangerous. Maybe i could borrow the idea from there, but then i've lost the link to that hook.12:40
kha pigeon: I suppose the hook might be configured to reject the commit if the merge was unsuccessful.12:41
→ lcapitulino joined12:43
→ tchan joined12:46
→ spearce joined13:21
→ kanru joined13:25
→ ofri joined13:51
→ Pistahhh joined14:14
→ jeffpc joined14:15
→ fhobia joined14:17
→ Pistahhh_ joined14:26
→ rphillips joined14:28
Pistahhh_ → Pistahh14:28
→ orospakr joined14:38
→ GeertB joined14:54
→ Pistahh joined15:27
→ Pistahhh joined15:32
Pistahhh → Pistahh15:46
→ ofri joined15:53
→ gitte joined16:01
→ Ralf joined16:19
→ alley_cat joined16:20
Ralf Is there something easy to get git to list all commit IDs between two commit IDs but not merge commits and not follow merge commits. That is, I basically want it to walk straight be the history only ever considering the first ancestor.16:25
→ Oejet joined16:27
kha Ralf: See --first-parent and --no-merges options to git-log. I think that'll let you do what you want.16:32
Ralf Is that a brand new option? My man page doesn't list it16:35
lcapitulino pasky: is it possible to create a git mirror of a svn project at repo.or.cz?16:47
pasky: I see that gitte is mirroring qemu16:48
kha Ralf: I think at least --first-parent is kind of new. But it's been around for at least a few weeks.16:54
→ lyakh joined16:55
→ aroben_ joined16:55
Ralf It's not in git 1.5.0.6 at least.16:57
kha Ralf: No, that's probably too old.16:57
Ralf: It was committed on March 13th.16:59
Ralf: It looks like the first release that had it was 1.5.1, on April 3rd.17:02
→ tcoppi_ joined17:13
tcoppi_ → tcoppi17:15
→ robinr joined17:17
→ vorago joined17:39
vorago http://git.or.cz/course/svn.html has a dead link at the end (Setting up a public repository); hope it helps someone... ;)17:40
→ aroben_ joined17:43
tko svn repository supports two access modes, http for anonymous read-only, and ssh+svn for read-write access. can I use git-svn to track the repository over http but temporarily switch over to ssh+svn to commit things?17:43
→ sewall joined17:57
vorago tko, http in subversion can have read-write access.17:59
With passwords defined in file. (vide DAV) just like GIT i guess.18:00
tko vorago: technically yes, but the repository admin won't enable it18:00
(gnome.org)18:00
vorago I see.18:00
→ strangy joined18:17
→ Pistahhh joined18:19
Pistahhh → Pistahh18:26
→ DrNick joined18:30
context git cant push over http18:37
or if it can its not widely used at all18:38
hg can18:38
evan context: sure it can, i use it a lot.18:38
context: using DAV18:38
context o ?18:39
is it fast18:39
url to how to set it up ?18:39
clee nothing involving DAV is ever fast18:39
context heh18:41
how does it compare to say ssh:18:41
→ gitte joined18:51
→ etnt joined18:54
→ Pistahhh joined18:57
Pistahhh → Pistahh19:03
← quellhorst_ left19:04
gitte lcapitulino: I am not mirroring CVS repo... I am mirroring the cvsimport of Jens Axboe...19:05
context: http-push? Read up on it in git's Documentation/howto/setup-git-server-over-http.txt19:06
lcapitulino oh19:06
gitte lcapitulino: I asked pasky if he would support mirroring CVS or SVN, and the outcome was not conclusive. He thought it might be too hard on the server.19:07
But then, maybe it is no longer.19:07
context gitte: thnx19:08
pasky I might try to start setting up mirrors on per-request basis19:08
give me the svn url please19:08
context meh thats to long19:08
ill stick th git-push19:08
git-svn kicks ass :D19:09
lcapitulino pasky: svn://test.kernel.org/autotest/trunk/19:11
pasky: don't know how big it's19:11
pasky I have no time to do it now so I'll probably forget - please drop me a one-line mail reminding me :)19:12
lcapitulino sure19:12
thanks :)19:13
→ robinr joined19:20
→ fultilt joined19:30
→ aroben_ joined19:30
→ segher joined19:30
→ aroben_ joined19:31
→ sgrimm joined19:32
→ dduncan joined19:53
→ Pistahhh joined19:54
→ Pistahhh_ joined19:59
Pistahhh_ → Pistahh20:12
→ Pistahhh joined20:16
Pistahhh → Pistahh20:17
→ robfitz_ joined20:17
→ robfitz joined20:47
→ nud joined20:56
→ ofri joined20:57
→ jasam joined21:00
→ sgrimm joined21:10
sewall Given a commit's id, how can I determine its parent?21:27
robinr sewall: by examinging all commits21:27
no shortcut there21:27
sewall doesn't a commit object have a list of its predecessors?21:28
robinr oops, wrong way21:28
sewall robinr: what?21:29
robinr git-cat-file -p commit21:29
or even shorter maybe...21:29
sewall whoops, okay21:30
I was looking at the root commit21:31
i.e. no parent21:31
→ eventualbuddha joined21:31
eventualbuddha i'm using git-svn, and i'm trying to commit my changes back upstream to the subversion repo, but my working copy is "out of date", yet the only way i know to update it is to use "git-svn rebase", which complains about several files that "needs update". any ideas?21:32
→ jeffpc joined21:40
→ vinu joined21:43
→ praka joined21:43
→ jdl joined21:43
vinu hey all21:45
→ praka joined21:46
vinu I was trying git-svn init -t tags -b branches -T trunk https://svn.perl.org/parrot and it does not work as intended..what is the right way to checkout an entire project?21:46
tokkee vinu: What did you do, what did you expect and what happened?21:49
vinu I expected an output like "Initialized empty Git repository in .git/"21:50
tokkee vinu: You have to do a "git svn fetch" and "git checkout" after doing "git svn init"...21:50
vinu but it gave me "Initialized empty Git repository in -T.git/"21:50
tokkee Oh... I think you have to remove the space between "-T" and "trunk".21:51
Hum... it does work for me (using git 1.5.1.4)...21:54
vinu k I removed all the spaces and gave git-svn init -ttags -bbranches -Ttrunk http://mysvnproject and I get "Initialized empty Git repository in -bbranches/.git/21:55
tokkee vinu: Which version of git do you use?21:56
vinu 1.5.0.621:56
the default installed using yum install git in FC621:57
tokkee $ git svn init -t tags -b branches -T trunk https://svn.perl.org/parrot21:57
gitster 1.5.0.X series seems to have that issue. git-svn saw quite a lot of changes since then.21:57
tokkee Initialized empty Git repository in .git/21:58
gitster FWIW, 1.5.0.7 does that too.21:58
normalperson vinu: use multi-init instead of init for 1.5.0.x21:58
gitster Ah, that's right. 'init' changed since then.21:59
vinu k I have no problems upgrading then :)..which version of git do you all recommend?21:59
gitster tip of 'next' ;-).21:59
jdl Is git-svn the quickest way to just grab the contents of a SVN into a sane git repo?21:59
Can I dodge installing SVN entirely then?21:59
Bah. All my context are belong to /dev/null. Power failure this morning!22:00
vinu thank you everyone - multi-init worked with my present version of git :) - i am thinking of upgrading though22:03
is the newer git compatible with older git repository?22:03
gitster absolutely.22:03
vinu great22:04
gitster going back is not necessarily possible, but I do not recall anything since 1.5.0.X unless you use superprojects.22:04
jdl I just uprev'ed one git from 1.4 era to top of git.git!22:04
gitster I still plan to find time to do 1.5.2.1 sometime this weekend, but for this project, point/tagged releases do not have much significance for people aiming for stability, not in the sense that they always have brown-paper-bag bugs, but in the sense that tip of 'master' tend to always be as stable as any tagged release.22:06
→ janm joined22:20
← vorago left22:26
→ agoode joined22:39
→ camrdal1 joined22:48
← camrdal1 left22:54
→ Pistahh joined22:58
→ bronson joined23:22
vinu is there any way I can tell git-svn that another svn repository has a branch (downloading only the revisions history from where I branched)?23:45
→ orospakr joined23:48
context svn doesnt have multi-repo branching23:52
trying to get git-svn to handle something like that23:52
would be insane23:52
there is no way for it to find a base for camparison23:52
vinu suppose I branch from 2053 and put it another svn - isn't 2053 the base(with r2053 the same as r0 in the new repo) - i m sure there might be other complications but just curious if it is possible at all23:58
→ gitte joined23:58
jdl The more I read about SVN here, the more screwy it sounds... :-/23:59

Logs Search ←Prev date Next date→ Channels Documentation