Timestamps are in GMT/BST.
| 00:14:52 | | Platskies Quit (Quit: Leaving) |
| 00:18:52 | | Platskies has joined |
| 00:38:28 | fordcars | Night! |
| 00:38:31 | | fordcars Quit (Quit: Page closed) |
| 01:49:05 | | Darrel Quit (Ping timeout: 264 seconds) |
| 02:01:59 | | Darrel has joined |
| 02:42:00 | | BFLogBot Commit: ab3774f1a5 | Author: watusimoto | Message: Fix building of tests |
| 02:42:57 | Watusimoto | night |
| 02:47:17 | | Watusimoto Quit (Ping timeout: 240 seconds) |
| 03:06:36 | | Platskies Quit (Quit: Sleep time…) |
| 03:12:27 | | Platskies has joined |
| 03:21:52 | | Platskies Quit (Ping timeout: 240 seconds) |
| 03:23:57 | | Platskies has joined |
| 05:30:07 | | LordDVG has joined |
| 07:02:18 | | LordDVG Quit (Remote host closed the connection) |
| 10:18:51 | | Raven67854 Quit (Remote host closed the connection) |
| 10:30:54 | | Platskies Quit (Quit: Platskies) |
| 11:21:53 | | Darrel Quit (Read error: Connection reset by peer) |
| 11:22:08 | | starseeker has left #bitfighter |
| 12:52:11 | | Watusimoto has joined |
| 13:21:58 | | Watusimoto Quit (Ping timeout: 245 seconds) |
| 13:28:03 | | watusimoto1 has joined |
| 14:17:34 | | raptor has joined |
| 14:17:34 | | ChanServ sets mode +o |
| 14:20:48 | raptor | good day |
| 14:20:49 | | watusimoto1 is now known as watusimoto |
| 14:20:51 | watusimoto | hi |
| 14:20:55 | raptor | hi |
| 14:21:01 | watusimoto | I got your email, haven't gone through it yet |
| 14:21:18 | watusimoto | I suppose that is my next step |
| 14:21:35 | raptor | i can probably filter it more - it's not that large |
| 14:21:51 | raptor | like remove the differences I know i'd need to keep from my clone |
| 14:22:05 | watusimoto | whatever... I'm mainly looking for stuff that has to do with walls or a few other things I will hoepfully recognize |
| 14:22:13 | raptor | ok |
| 14:22:18 | raptor | that's perfect |
| 14:22:53 | raptor | i hope you're not too upset about my merge assessment - it was a lot of work you did :( |
| 14:24:14 | watusimoto | I'm not upset |
| 14:24:30 | watusimoto | a little annoyed, but not at you |
| 14:25:03 | watusimoto | my main question at this point is why my mercurial view does not show the tags you added marking the various heads |
| 14:25:27 | watusimoto | and why I am not seeing as many heads as I expected to see |
| 14:25:29 | raptor | on this picture you showed me: Dobrin Dobrev; Steve Olsen |
| 14:25:31 | raptor | oops |
| 14:25:34 | raptor | wrong clipboard |
| 14:25:37 | raptor | http://i.imgur.com/74plE3p.png |
| 14:25:39 | raptor | ^^ that one |
| 14:25:45 | watusimoto | yes |
| 14:25:50 | raptor | see the lower 'default' one |
| 14:25:56 | watusimoto | yes |
| 14:26:13 | raptor | that's the one that was the 020 branch for you to merge with |
| 14:26:21 | watusimoto | I see |
| 14:26:44 | watusimoto | ok, I was misled by the commit message referencing 019d |
| 14:27:21 | raptor | ah |
| 14:27:21 | watusimoto | so what did I merge to? 019d? |
| 14:27:34 | raptor | yes |
| 14:27:39 | watusimoto | great! |
| 14:27:55 | watusimoto | so yes, I suppose using your changeset would make more sense |
| 14:28:27 | watusimoto | can we assign different names to the branches (other than default & default)? |
| 14:28:50 | watusimoto | I would find it clearer if we had one branch called 019d and one called 020 |
| 14:28:53 | raptor | so, i did assign 'fixes-019' as a name to the 019d branch |
| 14:29:07 | watusimoto | ok, that name does not appear in tortoise |
| 14:29:08 | raptor | and 'default' always stayed as the 020 branch |
| 14:29:14 | raptor | huh |
| 14:29:21 | watusimoto | as you can see from the img |
| 14:29:30 | raptor | is tortoise hiding bookmark names? |
| 14:29:37 | raptor | or were they not pulled from Google? |
| 14:29:42 | watusimoto | It shouldn't be, but I'll look tonight |
| 14:29:58 | raptor | I'm a little fuzzy about how bookmark names are transferred |
| 14:30:08 | watusimoto | I looked for any kind of command to "get bookmarks" and could find none |
| 14:30:19 | watusimoto | so my working assumption is that everything that can be pulled was pulled |
| 14:30:21 | raptor | you can view them on the command line with: hg bookmarks |
| 14:30:27 | watusimoto | I'll try that |
| 14:30:28 | raptor | i wonder... |
| 14:31:46 | raptor | seet he second paragraph under heading 5 here: http://mercurial.selenic.com/wiki/Bookmarks#Working_with_remote_repositories |
| 14:32:22 | raptor | oh... maybe you have mercurial version < 2.3 ? |
| 14:32:41 | raptor | if that were the case, then they wouldn't have gotten transferred |
| 14:40:53 | watusimoto | I think I have a recent version of mercurial, but it is possible... I'll look into all this tonight, and upgrade if necessary |
| 14:41:28 | watusimoto | By default all bookmarks on the server are updated on the client on pull, and all bookmarks that are already present on both the client and server are updated on the server on push. Prior to 2.3, only bookmarks present on both the client and server were updated on pull. |
| 14:41:39 | watusimoto | That would suggest I am using < 2.3, would it not? |
| 14:46:01 | | LordDVG has joined |
| 14:55:06 | raptor | yes... if that was the problem - but I can't think of another problem it could be unless tortoise is hiding the bookmarks |
| 14:56:37 | watusimoto | ok, well, I'll check tongiht, and then we'll know |
| 16:13:13 | | Watusimoto_ has joined |
| 16:20:45 | | Watusimoto__ has joined |
| 16:35:05 | | Watusimoto_ Quit (*.net *.split) |
| 16:47:17 | | Watusimoto__ Quit (Ping timeout: 264 seconds) |
| 18:27:19 | | LordDVG Quit (Remote host closed the connection) |
| 18:45:39 | | Watusimoto_ has joined |
| 18:50:08 | raptor | ok, heading home soon. later! |
| 18:50:24 | raptor | tell me what you think of the new icon set sometime... |
| 18:50:27 | | raptor Quit () |
| 18:50:37 | | Watusimoto_ Quit (Ping timeout: 240 seconds) |
| 20:16:19 | | Watusimoto_ has joined |
| 20:43:37 | | Watusimoto_ Quit (Ping timeout: 245 seconds) |
| 21:03:00 | | Watusimoto_ has joined |
| 21:28:40 | | Watusimoto__ has joined |
| 21:31:19 | | Watusimoto_ Quit (Ping timeout: 255 seconds) |
| 21:32:52 | | Watusimoto_ has joined |
| 21:35:34 | | Watusimoto__ Quit (Ping timeout: 244 seconds) |
| 21:52:45 | | watusimoto Quit (Quit: Leaving.) |
| 23:02:34 | | Watusimoto_ Quit (Ping timeout: 264 seconds) |
