├── grafts └── README.rst /grafts: -------------------------------------------------------------------------------- 1 | ac64e91a0cadc57f4bc5cd5d66955832320ca7a1 553a20075e6991e7a60baee51ea68c8adc520d9a 0cb8e31823b2e9f05c4ae868c19f5f38e78a5f2e 2 | 79e68c225b926302ebb29c808dda8afa49856f5c d0f57e7c7385a112cb9e19d314352fc5ed5b0747 aa239e3e5405933af6a29dac3cf587b59a099927 3 | 5cf8f684237ab5addaf3549b2347c3adf107c0a7 cb45fd0ae20597306cd1f877efc99d9bd7cbee98 e27211a0deae2f1d402537f0ebb64ad4ccf6a4da 4 | f69cf70ed813a8cd7e1f963a14ae39103e8d5265 d5dbeaa9be359a4c794885c2e9f1b5a7e5e51fb8 d2fcbcf9d76d5bb8a661ee73dae976c74183098b 5 | aab3a418ac9293bb4abd7670f65d930cb0426d58 4ea7a11659b8a0ab07b0d2e847975f7324664f10 adf4b9311d5d64a2bdd58da50271c121ea22e397 6 | ff60c5f9de3e8690d1e86f3e9e3f7248a15397c8 7ef212af149540aa2da577a960d0d87029fd1514 45b4288bb66a3cda401b45901e85b645674c3988 7 | 9dda4abee1225db7a7b195b84c915fdd141a7260 4fe5c9b7ee09dc25921918a6dbb7605edb374bc9 3a7c14b583621272d4ef53061287b619ce3c290d 8 | a19ed8aea395e8e07164ff7d85bd7dff2f24edca dc375fb0f3b7fbae740e8cfcd791b8bccb8a4e66 42ea7a5ce8aece67d16c6610a49560c1493d4653 9 | 9c52d56f6f8a9cdafb231adf9f4110473099c9b5 c91a30f00fd182faf8ca5c03cd7dbcf8b735b458 4a5c5c78f2ecd4ed8859cd5ac773ff3a01bccf96 10 | 953badbea5a04159adbfa970f5805c0232b6a401 4c958b15b250866b70ded7d82aa532f1e57f96ae 5664a678b29ab04cad425c15b2792f4519f43928 11 | 471596fc1afcb9c6258d317c619eaf5fd394e797 4e89105d64bb9e04c409139a41e9c7aac263df4c 3e9035a9625c8a8a5e88361133e87ce455c4fc13 12 | 9233d0426537615e06b78d28010d17d5a66adf44 6632739e94c6c38b4c5a86cf5c80c48ae50ac49f 18e151bc3f8a85f2766d64262902a9fcad44d937 13 | -------------------------------------------------------------------------------- /README.rst: -------------------------------------------------------------------------------- 1 | django-git-grafts 2 | ################# 3 | 4 | Git ``.git/info/grafts`` file for branch merges performed during Django 5 | development history. 6 | 7 | Which branches were merged into trunk and when? 8 | ############################################### 9 | 10 | AKA SVN archeology. 11 | 12 | #. Boulder Oracle sprint 13 | 14 | * Branch name: ``bould-oracle-sprint`` 15 | * Merged in: r5519 (https://code.djangoproject.com/changeset/5519) -- 06/23/07 11:16:00 16 | * Merge commit: ``ac64e91a0cadc57f4bc5cd5d66955832320ca7a1`` 17 | * Parent commit in trunk: ``553a20075e6991e7a60baee51ea68c8adc520d9a`` 18 | * Parent commit in branch: ``0cb8e31823b2e9f05c4ae868c19f5f38e78a5f2e`` 19 | 20 | #. GIS 21 | 22 | * Branch name: ``gis`` 23 | * Merged in: r8219 (https://code.djangoproject.com/changeset/8219) -- 08/05/08 15:13:06 24 | * Merge commit: ``79e68c225b926302ebb29c808dda8afa49856f5c`` 25 | * Parent commit in trunk: ``d0f57e7c7385a112cb9e19d314352fc5ed5b0747`` 26 | * Parent commit in branch: ``aa239e3e5405933af6a29dac3cf587b59a099927`` 27 | 28 | #. i18n (original hugo's work) 29 | 30 | * Branch name: ``i18n`` 31 | * Merged in: r1068 (https://code.djangoproject.com/changeset/1068) -- 11/04/05 01:59:46 32 | * Merge commit: ``5cf8f684237ab5addaf3549b2347c3adf107c0a7`` 33 | * Parent commit in trunk: ``cb45fd0ae20597306cd1f877efc99d9bd7cbee98`` 34 | * Parent commit in branch: ``e27211a0deae2f1d402537f0ebb64ad4ccf6a4da`` 35 | 36 | #. Magic removal 37 | 38 | * Branch name: ``magic-removal`` 39 | * Merged in: r2809 (https://code.djangoproject.com/changeset/2809) -- 05/01/06 22:31:56 40 | * Merge commit: ``f69cf70ed813a8cd7e1f963a14ae39103e8d5265`` 41 | * Parent commit in trunk: ``d5dbeaa9be359a4c794885c2e9f1b5a7e5e51fb8`` 42 | * Parent commit in branch: ``d2fcbcf9d76d5bb8a661ee73dae976c74183098b`` 43 | 44 | #. multi-auth 45 | 46 | * Branch name: ``multi-auth`` 47 | * Merged in: r3226 (https://code.djangoproject.com/changeset/3226) -- 06/28/06 13:37:02 48 | * Merge commit: ``aab3a418ac9293bb4abd7670f65d930cb0426d58`` 49 | * Parent commit in trunk: ``4ea7a11659b8a0ab07b0d2e847975f7324664f10`` 50 | * Parent commit in branch: ``adf4b9311d5d64a2bdd58da50271c121ea22e397`` 51 | 52 | #. Alex's Multiple DB support (GSoC 2009) (MANUAL SVN MERGE) 53 | 54 | * Branch name: ``multidb`` 55 | * Merged in: r11952 (https://code.djangoproject.com/changeset/11952) -- 12/22/09 56 | * Merge commit: ``ff60c5f9de3e8690d1e86f3e9e3f7248a15397c8`` 57 | * Parent commit in trunk: ``7ef212af149540aa2da577a960d0d87029fd1514`` 58 | * Parent commit in branch: ``45b4288bb66a3cda401b45901e85b645674c3988`` 59 | 60 | #. rjwittams' first admin refactoring 61 | 62 | * Branch name: ``new-admin`` 63 | * Merged in: r1434 (https://code.djangoproject.com/changeset/1434) -- 11/25/05 18:20:09 64 | * Merge commit: ``9dda4abee1225db7a7b195b84c915fdd141a7260`` 65 | * Parent commit in trunk: ``4fe5c9b7ee09dc25921918a6dbb7605edb374bc9`` 66 | * Parent commit in branch: ``3a7c14b583621272d4ef53061287b619ce3c290d`` 67 | 68 | #. Second admin refactoring 69 | 70 | * Branch name: ``newforms-admin`` 71 | * Merged in: r7967 (https://code.djangoproject.com/changeset/7967) -- 07/18/08 20:54:34 72 | * Merge commit: ``a19ed8aea395e8e07164ff7d85bd7dff2f24edca`` 73 | * Parent commit in trunk: ``dc375fb0f3b7fbae740e8cfcd791b8bccb8a4e66`` 74 | * Parent commit in branch: ``42ea7a5ce8aece67d16c6610a49560c1493d4653`` 75 | 76 | #. Malcolm's QuerySet refactor 77 | 78 | * Branch name: ``queryset-refactor`` 79 | * Merged in: r7477 (https://code.djangoproject.com/changeset/7477) -- 04/26/08 23:50:16 80 | * Merge commit: ``9c52d56f6f8a9cdafb231adf9f4110473099c9b5`` 81 | * Parent commit in trunk: ``c91a30f00fd182faf8ca5c03cd7dbcf8b735b458`` 82 | * Parent commit in branch: ``4a5c5c78f2ecd4ed8859cd5ac773ff3a01bccf96`` 83 | 84 | #. Unicode 85 | 86 | * Branch name: ``unicode`` 87 | * Merged in: r5609 (https://code.djangoproject.com/changeset/5609) -- 07/04/07 09:11:04 88 | * Merge commit: ``953badbea5a04159adbfa970f5805c0232b6a401`` 89 | * Parent commit in trunk: ``4c958b15b250866b70ded7d82aa532f1e57f96ae`` 90 | * Parent commit in branch: ``5664a678b29ab04cad425c15b2792f4519f43928`` 91 | 92 | #. model validation (GSoC 2009) (MANUAL SVN MERGE) 93 | 94 | * Branch name: ``model-validation`` 95 | * Merged in: r12098 (https://code.djangoproject.com/changeset/12098) -- 09/11/09 18:23:55 96 | * Merge commit: ``471596fc1afcb9c6258d317c619eaf5fd394e797`` 97 | * Parent commit in trunk: ``4e89105d64bb9e04c409139a41e9c7aac263df4c`` 98 | * Parent commit in branch: ``3e9035a9625c8a8a5e88361133e87ce455c4fc13`` 99 | 100 | #. i18n-improvements (GSoC 2009) (MANUAL SVN MERGE) 101 | 102 | * Branch name: ``i18n-improvements`` 103 | * Merged in: r11964 (https://code.djangoproject.com/changeset/11964) -- 12/22/09 14:58:49 104 | * Merge commit: ``9233d0426537615e06b78d28010d17d5a66adf44`` 105 | * Parent commit in trunk: ``6632739e94c6c38b4c5a86cf5c80c48ae50ac49f`` 106 | * Parent commit in branch: ``18e151bc3f8a85f2766d64262902a9fcad44d937`` 107 | 108 | See also 109 | ######## 110 | 111 | https://gist.github.com/2554646 112 | --------------------------------------------------------------------------------