01:14.39 |
*** join/#brlcad KimK
(~Kim__@wsip-184-176-200-171.ks.ks.cox.net) |
01:50.18 |
Notify |
03BRL-CAD Wiki:Owersesside * 0
/wiki/User:Owersesside: |
07:20.14 |
*** join/#brlcad tujli
(740103cf@gateway/web/freenode/ip.116.1.3.207) |
07:20.31 |
tujli |
hi brlcad |
08:29.33 |
*** join/#brlcad harmanpreet
(~chatzilla@124.253.78.250) |
10:20.03 |
*** join/#brlcad EricPoehlsen
(~Eric@ip-109-41-234-215.web.vodafone.de) |
10:20.58 |
*** join/#brlcad EricPoehlsen
(~Eric@ip-109-41-234-215.web.vodafone.de) |
10:39.46 |
*** join/#brlcad EricPoehlsen
(~Eric@ip-109-41-234-215.web.vodafone.de) |
11:10.22 |
*** join/#brlcad pawleeq
(~pawleeq@static-cl031028150026.unet.cz) |
11:10.29 |
pawleeq |
hi |
13:38.31 |
*** join/#brlcad merzo
(~merzo@204-112-201-46.pool.ukrtel.net) |
16:18.55 |
*** join/#brlcad luca79
(~luca@13.113.227.87.static.ld.siw.siwnet.net) |
16:28.33 |
*** join/#brlcad merzo
(~merzo@178.92.234.176) |
16:36.52 |
pawleeq |
I have created the new logo in brlcad, if you
are still interested |
17:11.08 |
*** join/#brlcad EricPoehlsen
(~Eric@dslb-084-056-082-235.pools.arcor-ip.net) |
17:38.57 |
*** join/#brlcad Skriptkid
(~Skriptkid@117.208.163.237) |
17:45.54 |
Skriptkid |
http://kkovacs.eu/the-tao-of-programming |
17:46.12 |
Skriptkid |
Just thought this might interest people. Worth
a read. |
17:50.27 |
caen23 |
Skriptkid: did you read "teach yourself
programming in 10 years"? |
17:50.48 |
Skriptkid |
Nope. Why? |
17:50.58 |
caen23 |
you should, it's a good read |
17:51.17 |
Skriptkid |
Will do. Thanks :) |
17:51.29 |
caen23 |
it's about the same length as the link you
posted |
17:52.22 |
Skriptkid |
Yeah. Opened it up just now. |
18:36.29 |
*** join/#brlcad Skriptkid
(~Skriptkid@117.208.163.237) |
18:37.49 |
*** join/#brlcad EricPoehlsen
(~Eric@dslb-084-056-082-235.pools.arcor-ip.net) |
20:03.24 |
*** join/#brlcad EricPoehlsen
(~Eric@dslb-084-056-082-235.pools.arcor-ip.net) |
20:13.44 |
Notify |
03BRL-CAD Wiki:Stevar1111 * 0
/wiki/User:Stevar1111: |
20:18.19 |
*** join/#brlcad luca79
(~luca@13.113.227.87.static.ld.siw.siwnet.net) |
20:44.49 |
Notify |
03BRL-CAD Wiki:Pitamersib * 0
/wiki/User:Pitamersib: |
21:30.51 |
*** join/#brlcad starseeker
(~starseeke@66-118-151-70.static.sagonet.net) |
21:31.19 |
kanzure |
starseeker: excellent work on separating out
the scl history into the git repo. |
21:31.32 |
starseeker |
kanzure: thanks |
21:31.55 |
starseeker |
hopefully that will be useful from a merging
standpoint |
21:32.34 |
kanzure |
i'm not familiar with merges of this
magnitude, but my first idea was to do an incremental merge based
on this |
21:32.45 |
kanzure |
for instance, you would merge one file at a
time because of the manual work involved |
21:33.30 |
starseeker |
possibly. Mark (stepcode project lead) seems
to be a lot more comfortable with git than I am, so I'm hoping
he'll chime in |
21:34.06 |
kanzure |
i had to do a lot of cvs->svn->git
rescuing for nanoengineer, it involved lots of antics :/ |
21:34.19 |
kanzure |
i was thinking i should record all of the
steps i had to use and sing it to the tune of tom lehrer's "new
math" |
21:34.26 |
starseeker |
hehe |
21:34.49 |
kanzure |
"you can't pull from remote because remote is
less than head, but head is really two ahead and you can't take
68bc from f78 because.." |
21:34.57 |
kanzure |
well, it's hard to sing in irc. |
21:35.48 |
starseeker |
I suppose I should record it... was a
combination of the tricks used for utahrle breakout and hints from
here:
http://stackoverflow.com/questions/1683531/how-to-import-existing-git-repository-into-another |
21:36.32 |
kanzure |
svn-all-fast-export was really helpful because
it uses a separate rules file for how to process svn
commits |
21:36.59 |
starseeker |
the utahrle process I did document:
http://sourceforge.net/p/utahrle/utahrle/ci/2a06256d8604b80c33376119403c88368c926033/tree/doc/svn-to-git.txt |
21:37.41 |
starseeker |
yeah - svn-all-fast-export seems to be the
tool of choice, even though it takes some digging to figure out how
to get it to fly |
21:38.12 |
starseeker |
in most respects, utahrle was more complicated
- tracking the history around between different directories was
tricky |
21:38.56 |
starseeker |
kanzure: did you break out nanoengineer into
different git repos, or was it all in one repo? |
21:39.41 |
kanzure |
it was all in one repo, plus
branches |
21:39.56 |
kanzure |
they originally did a bad cvs->svn
conversion, so i had to fix that first |
21:40.01 |
kanzure |
then i was able to save all of the
branches |
21:40.17 |
starseeker |
ah |
21:40.37 |
starseeker |
yeah, that's one thing that helps here - don't
have to worry about branches for these cases |
21:40.59 |
kanzure |
git filter-branch is also very handy.. i've
been trying to manipulate github's contributions calendar to write
text on the calendar dates: |
21:41.04 |
kanzure |
https://github.com/kanzure |