(name 'MC2-SqueakUI-cwp.15' message 'Added a command to apply all the changes that are part of a snapshot inclusion (only enabled when all the merges are resolved). Unresolved merges are now displayed in bold.' id '8e8923ba-6fde-432e-88fc-6070a1b9d2d7' date '13 December 2007' time '12:05:55 am' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.14' message 'It''s now possible to include a snapshot using the conflict browser: added a command to apply the merge resolution, added commands to load the local or remote versions without affecting version history. ' id '61033ba0-ee48-4ed0-a38b-311fafd5fc09' date '12 December 2007' time '10:56:08 pm' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.13' message 'Improvements to the conflict browser: version properties are now correctly displayed, there are commands for choosing the local or remote versions of the node, the definition panels update when a version is chosen.' id 'f02571ef-9b0b-498f-9c74-ca499a3cc174' date '12 December 2007' time '2:05:11 am' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.12' message 'Added an ''include'' command which opens a rudimentary conflict browser.' id '7ac6b536-bdea-493e-a020-3dadc23f185b' date '9 December 2007' time '1:23:56 pm' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.11' message 'Tweak tests to account for slice and repository commands checking the metagraph.' id 'a98081ce-8dda-43f7-9801-4ea7675faca4' date '6 December 2007' time '1:47:23 pm' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.10' message 'The commands for adding slices and repositories now appear only when slices or repositories are being displayed.' id 'e170cc2f-010c-495c-8639-355d1985caae' date '5 December 2007' time '1:19:51 am' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.9' message 'The "save to file" command now uses the project''s workspace rather than the default.' id 'e83558fe-8777-40b0-b565-3fa8da762ddb' date '3 December 2007' time '5:19:38 am' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.8' message 'Created commands for adding and removing repositories.' id '0aec371e-d6fe-4c00-8e08-ab3d6e3c81e1' date '20 November 2007' time '12:39:12 am' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.7' message 'Created a command to remove a slice from a project.' id 'e1bbc01f-2f3c-4fb1-a549-2412ce1b3036' date '19 November 2007' time '11:41:52 pm' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.6' message 'Created a command to add a slice to the project.' id 'ffee5f00-7f55-4a0c-a836-5d50027b683c' date '19 November 2007' time '11:17:35 pm' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.5' message 'Added a command to load a snapshot.' id '909080fb-61eb-4481-a63e-1daaf555e3b9' date '18 November 2007' time '12:25:42 am' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.4' message 'Memos are now sorted in the project browser.' id 'ebc21069-0a6d-4e70-9334-1bcd41ec6e26' date '16 November 2007' time '1:42:57 am' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.3' message 'Converted SliceListBrowser into a simple ProjectBrowser.' id '44d372ef-6d29-40c5-956a-0caae417461d' date '12 November 2007' time '11:44:43 pm' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.2' message 'Added a command to save a slice to a file.' id '446f9a56-3ec9-4069-8f70-d4c9e508fcd5' date '9 November 2007' time '1:08:58 am' author 'cwp' ancestors ((name 'MC2-SqueakUI-cwp.1' message 'Created a new slice panel based on OmniBrowser.' id 'a5e15d25-1a9e-4f98-8fe8-2150db866b04' date '9 November 2007' time '12:37:06 am' author 'cwp' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())