00:04 (quit) toekutr: Ping timeout: 265 seconds
00:11 Lajla: How to defeat progamers
00:16 (join) offby1`
00:17 (quit) offby1: Disconnected by services
00:17 (nick) offby1` -> offby1
00:17 (quit) offby1: Changing host
00:17 (join) offby1
01:03 (quit) jeapostrophe: Quit: jeapostrophe
01:25 (join) samth
01:47 (join) Fare
02:14 (quit) Fare: Quit: Leaving
02:22 (quit) samth: Ping timeout: 240 seconds
03:10 (quit) carleastlund: Quit: carleastlund
03:53 (quit) Lajla: *.net *.split
03:53 (quit) MarcWeber: *.net *.split
03:55 (join) MarcWeber
03:56 (join) Lajla
04:52 (join) masm
05:12 (quit) Lajla: Read error: Connection reset by peer
05:12 (join) Lajla
05:18 (join) mceier
05:26 (quit) rudybot: Read error: Operation timed out
05:28 (join) rudybot
05:31 (quit) rudybot: Read error: Operation timed out
05:34 (join) rudybot
06:22 (quit) mceier: Read error: Operation timed out
06:22 (join) mceier
07:55 (join) b-man_
08:18 (join) MayDaniel
08:35 (quit) MayDaniel: 
08:38 (join) jao
09:05 (join) jeapostrophe
09:06 (join) hanDerPeder
09:20 (join) danbrown
10:08 (quit) b-man_: Remote host closed the connection
10:23 (join) MayDaniel
10:37 (join) carleastlund
10:46 (quit) MayDaniel: Read error: Connection reset by peer
10:47 (join) anRch
10:49 (quit) jeapostrophe: Quit: jeapostrophe
10:51 (quit) danbrown: Quit: danbrown
11:02 (quit) hanDerPeder: Quit: hanDerPeder
11:09 (join) hanDerPeder
11:13 (quit) hanDerPeder: Ping timeout: 264 seconds
11:23 (join) MayDaniel
11:25 (join) jeapostrophe
11:29 (quit) jeapostrophe: Client Quit
11:30 (join) carleastlund_
11:30 (quit) carleastlund: Remote host closed the connection
11:30 (nick) carleastlund_ -> carleastlund
11:47 (join) jeapostrophe
11:49 (quit) jeapostrophe: Client Quit
11:58 (quit) anRch: Quit: anRch
12:04 (nick) mattmigh` -> mattmight
12:06 (join) anRch
12:08 (join) jsnikeri`
12:11 (quit) jsnikeris: Ping timeout: 245 seconds
12:16 (join) b-man_
12:40 (join) samth
12:42 (quit) anRch: Quit: anRch
13:10 (quit) samth: Ping timeout: 255 seconds
13:32 (join) danbrown
13:40 (quit) danbrown: Quit: danbrown
13:52 (join) carleastlund_
14:05 (quit) MayDaniel: 
14:11 (join) MayDaniel
14:16 (quit) MayDaniel: Client Quit
15:26 eli: bremner: ping
15:30 eli: bremner: never mind, I posted to the list, so tell me if there's anything that looks wrong there.
15:31 bremner shamefacedly confesses to not being subscribed to the list
15:31 eli: bremner: Give me a second...
15:31 eli: bremner: Here's the punchline -- http://tmp.barzilay.org/x
15:32 eli: The quoted "merged into" is me trying to describe:
15:33 eli: git checkout stable; git merge -s theirs release
15:33 eli: Which is the commit that serves only to make the history connection.
15:35 bremner: the diagrams make sense to me
15:35 eli: OK, that's what I wanted to verify with you -- thanks!
15:36 bremner: about the merge, do you mean -s theirs or -s recursive -X theirs ?
15:37 eli: Just `-s theirs' -- there's no need for anything else, no?
15:37 bremner: I never used that before...
15:37 bremner: what version of git are we talking about?
15:37 eli: IIUC, it's a cheap way of saying that I want both to be the parents, but I really don't care about the old content.
15:38 eli: The most recent one -- 1.7.1.3
15:39 (join) samth
15:39 bremner: let me play a bit and get back to you
15:40 (join) danbrown
15:40 eli: bremner: OK.
15:40 eli: bremner: FWIW, what I did to tie the knot to `master' was similar: git checkout master; git merge -s ours release
15:44 bremner: hmm, rats, -s theirs doesn't seem to exist in 1.7.2.3.  I'll look at it later on my "experimental" machine.
15:45 eli: You mean 1.6.2.3?
15:45 bremner: anyway, the details of the merge don't change the plan outline in your mail.
15:45 bremner: no, 1.7.2.3, debian unstable
15:45 bremner: I think ours is old, but theirs is new?
15:46 eli: That's the *debian* version?  (Not the debian version of git...)
15:46 eli: I'll look for the man page that mentioned that.
15:47 bremner: no, it is the git version in debian, 1:1.7.2.3-2 to be precise
15:48 eli: Ugh -- I see what's wrong -- I had a typo earlier
15:49 eli: I'm using 1.7.3.1
15:49 eli: (I was worried that I somehow missed a release.)
15:49 eli: In any case, http://www.kernel.org/pub/software/scm/git/docs/git-merge.html -- look for "MERGE STRATEGIES".
15:49 (join) fjl
15:50 eli: This makes it look like there's no `-s theirs'.
15:51 eli: So I'll need to just swap things.  (I'll wait with that until I get there.)
15:51 (part) fjl
15:51 bremner: you may be just as happy with -s recursive -X theirs, since that takes the other history for any conflicts.
15:52 eli: I don't want to risk any changes leaking through somehow -- which is why I like the wholesale ignoring way.
15:53 bremner: there are a few corner cases that it doesn't magic away, but git mergetool cruises through those pretty quickly as long as you are not looking at some massive change like renaming every file to .rkt :)
15:53 eli: Heh, yeah, we still have some organizational changes in the future..
16:19 (quit) samth: Ping timeout: 265 seconds
16:24 (join) MayDaniel
16:24 (quit) MayDaniel: Changing host
16:24 (join) MayDaniel
16:52 (quit) b-man_: Ping timeout: 265 seconds
17:11 (quit) carleastlund: Quit: carleastlund
17:11 (nick) carleastlund_ -> carleastlund
17:40 (quit) MayDaniel: 
18:14 (join) samth
18:29 (quit) samth: Ping timeout: 240 seconds
18:30 (join) samth
18:36 (quit) samth: Ping timeout: 240 seconds
19:00 (quit) danbrown: Quit: danbrown
19:01 (join) samth
19:06 (join) rmitt
19:22 (quit) carleastlund: Quit: carleastlund
19:41 (quit) samth: Read error: Operation timed out
19:46 (quit) mceier: Quit: leaving
20:18 (join) b-man_
20:38 rmitt: is C++ the only language that allows nested namespaces?
20:39 rmitt: and can nesting be achieved in Racket's modules?
20:40 rmitt: (the short answer is of course no, but...)
20:45 rmitt: auf wiedersehen
20:45 (quit) rmitt: Quit: Page closed
21:04 (quit) b-man_: Ping timeout: 265 seconds
21:42 (nick) emma -> emmaldp
21:42 (nick) emmaldp -> emma
21:51 (quit) mattmight: Ping timeout: 264 seconds
21:51 (join) mattmight
22:12 (join) carleastlund
22:19 (quit) carleastlund: Quit: carleastlund
22:19 (join) carleastlund
23:12 (quit) carleastlund: Quit: carleastlund