Perl 6 - the future is here, just unevenly distributed

IRC log for #plparrot, 2010-10-22

| Channels | #plparrot index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:06 justatheory left #plparrot
00:47 justatheory joined #plparrot
01:50 pg_docbot left #plparrot
01:57 davidfetter left #plparrot
05:39 justatheory left #plparrot
15:44 justatheory joined #plparrot
17:09 davidfetter joined #plparrot
17:13 dukeleto davidfetter: hola
17:14 davidfetter hola dukeleto. got a minute re: some git-fu?
17:15 davidfetter during the Great Git Migration™, there was some tweaking of the early history of the CVS repo, which resulted in a totally different git repo from things on which patches had previously been based
17:16 davidfetter so when i add such branches as remotes, i get dire warnings like "no common commits
17:16 davidfetter "
17:16 davidfetter do i just git diff, make a new branch based on the hand-edited diff, and go from there?
17:44 dukeleto davidfetter: hmmm
17:44 dukeleto davidfetter: what do you mean "hand-edited" diff?
17:45 dukeleto davidfetter: and why are you adding branches from an (essentially) different git repo ?
17:46 davidfetter this is in re: #writeable_cte
17:46 davidfetter i'd like to get a more modern patch for it
17:46 davidfetter @ dukeleto
17:46 davidfetter and possibly a more modern repo for people to play with
17:47 dukeleto davidfetter: when you see "no commits in common" you have multiple roots in your git repo, which means you have a disjoint DAG
17:48 davidfetter well, it does produce a diff, which is gigantic
17:48 davidfetter is there some way to choose only parts of that?
17:49 dukeleto davidfetter: git diff takes files or directories as arguments
17:50 davidfetter hrm. is there some kind of picker where i can say, "get this, but not that?"
18:03 dukeleto davidfetter: probably. be more specific
18:04 davidfetter ok, there are an enormous number of files i get when i say git diff master
18:05 davidfetter is there some way to go through those and say, "i only want these in the patch?"
18:07 * davidfetter R'ing TFM for git merge & friends
18:24 dukeleto davidfetter: git diff file1 file2 ...
18:24 dukeleto davidfetter: git diff master -- file1 file2 ..., rather
18:24 dukeleto davidfetter: the -- seperates branch names from paths
18:55 pg_docbot joined #plparrot
18:58 cxreg dukeleto: the pg git repo was totally rebuilt
18:58 cxreg thats why there's no common commits
18:58 cxreg davidfetter: pull --rebase might hellp
18:59 cxreg davidfetter: perhaps instead of a diff, you want patches?
18:59 davidfetter cxreg, do tell
18:59 cxreg man git-format-patch
19:02 dukeleto you don't want to rebase, you have 2 divergent histories in the same repo
19:02 cxreg er
19:02 cxreg pull --rebase is different
19:03 cxreg oh wait
19:03 cxreg maybe not, if there's /no/ common history
19:03 * davidfetter should have brought this up over in #writeable_cte
19:03 cxreg no wait, it will
19:03 davidfetter it's more germane there
19:03 cxreg still, format-patch is better
19:04 cxreg i noticed a massive amount of "omg what do i do" in the pg community when that happened
19:04 cxreg i wish i were paying more attention, i could have saved people a lot of time
19:04 cxreg sigh
19:04 davidfetter cxreg, if you have a community account, you still can
19:05 davidfetter by suitably editing the git part(s) of the wiki
19:05 cxreg well, most people have since ditched the old repo
19:05 cxreg which was the painful part
19:05 davidfetter for those who haven't, you'll be providing an invaluable service

| Channels | #plparrot index | Today | | Search | Google Search | Plain-Text | summary