# y2_checkin statefile format 1.0 # records the merge state and history for merging changes from other branches # to the branch of the current working directory # URLs of other branches and the highest revisions we have looked at http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader 22587 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 26031 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 30669 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader 41125 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 37794 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41157 # revisions seen: # http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader 21937 21967 22006 22037 22040 22055 22100 22113 22239 22285 22312 22318 22488 22587 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 25537 25727 26031 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 30669 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader 41091 41092 41125 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 31627 31731 33390 34876 35236 35340 35342 35344 35347 35356 35413 35417 35650 35829 35850 35916 35917 35999 36005 36006 36027 36059 36143 36175 36768 36888 36889 36890 36900 36960 36961 36964 37091 37172 37196 37377 37430 37448 37451 37616 37672 37673 37674 37675 37676 37677 37678 37761 37762 37794 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41157 # revisions postponed: # http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader # source: # merge states of the revisions MERGE_STATE[21937]='not_merged' MERGE_STATE[21967]='not_merged' MERGE_STATE[22006]='not_merged' MERGE_STATE[22037]='not_merged' MERGE_STATE[22040]='not_merged' MERGE_STATE[22055]='not_merged' MERGE_STATE[22100]='not_merged' MERGE_STATE[22113]='not_merged' MERGE_STATE[22239]='not_merged' MERGE_STATE[22285]='not_merged' MERGE_STATE[22312]='not_merged' MERGE_STATE[22318]='not_merged' MERGE_STATE[22488]='not_merged' MERGE_STATE[22587]='not_merged' MERGE_STATE[25537]='not_merged' MERGE_STATE[25727]='not_merged' MERGE_STATE[26031]='not_merged' MERGE_STATE[30669]='not_merged' MERGE_STATE[31508]='not_merged' MERGE_STATE[31536]='not_merged' MERGE_STATE[31598]='not_merged' MERGE_STATE[31627]='already_merged' MERGE_STATE[31728]='not_merged' MERGE_STATE[31731]='already_merged' MERGE_STATE[31732]='not_merged' MERGE_STATE[33390]='already_merged' MERGE_STATE[34622]='not_merged' MERGE_STATE[34876]='already_merged' MERGE_STATE[35236]='already_merged' MERGE_STATE[35340]='already_merged' MERGE_STATE[35342]='already_merged' MERGE_STATE[35344]='already_merged' MERGE_STATE[35347]='already_merged' MERGE_STATE[35356]='already_merged' MERGE_STATE[35413]='already_merged' MERGE_STATE[35417]='already_merged' MERGE_STATE[35650]='merged' MERGE_STATE[35829]='already_merged' MERGE_STATE[35850]='already_merged' MERGE_STATE[35916]='merged' MERGE_STATE[35917]='already_merged' MERGE_STATE[35999]='merged' MERGE_STATE[36005]='already_merged' MERGE_STATE[36006]='already_merged' MERGE_STATE[36027]='merged' MERGE_STATE[36059]='merged' MERGE_STATE[36143]='already_merged' MERGE_STATE[36175]='already_merged' MERGE_STATE[36768]='already_merged' MERGE_STATE[36888]='merged' MERGE_STATE[36889]='merged' MERGE_STATE[36890]='merged' MERGE_STATE[36900]='merged' MERGE_STATE[36960]='merged' MERGE_STATE[36961]='merged' MERGE_STATE[36964]='merged' MERGE_STATE[37091]='merged' MERGE_STATE[37172]='merged' MERGE_STATE[37196]='merged' MERGE_STATE[37377]='already_merged' MERGE_STATE[37430]='merged' MERGE_STATE[37448]='merged' MERGE_STATE[37451]='merged' MERGE_STATE[37616]='merged' MERGE_STATE[37672]='merged' MERGE_STATE[37673]='merged' MERGE_STATE[37674]='merged' MERGE_STATE[37675]='merged' MERGE_STATE[37676]='merged' MERGE_STATE[37677]='merged' MERGE_STATE[37678]='merged' MERGE_STATE[37761]='merged' MERGE_STATE[37762]='merged' MERGE_STATE[37794]='merged' MERGE_STATE[41091]='not_merged' MERGE_STATE[41092]='not_merged' MERGE_STATE[41125]='not_merged' MERGE_STATE[41157]='already_merged' # comments for postponed / not merged revisions REV_COMMENT[41091]='This is change #41092 on branch http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader. ------------------------------------------------------------------------ r41091 | odabrunz | 2007-09-25 19:35:47 +0200 (Tue, 25 Sep 2007) | 4 lines Changed paths: M /branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp - re-read bootloader config from system after the delayed run of perl-Bootloader updates, then call FlagOnetimeBoot() based on current setup (#328078) ------------------------------------------------------------------------ r41092 | odabrunz | 2007-09-25 19:49:07 +0200 (Tue, 25 Sep 2007) | 2 lines Changed paths: M /branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state - updated merge state ------------------------------------------------------------------------ These changes are not merged to branch http://svn.opensuse.org/svn/yast/trunk/bootloader, because - they were previously merged from the current branch' REV_COMMENT[41092]='This is change #41092 on branch http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader. ------------------------------------------------------------------------ r41091 | odabrunz | 2007-09-25 19:35:47 +0200 (Tue, 25 Sep 2007) | 4 lines Changed paths: M /branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp - re-read bootloader config from system after the delayed run of perl-Bootloader updates, then call FlagOnetimeBoot() based on current setup (#328078) ------------------------------------------------------------------------ r41092 | odabrunz | 2007-09-25 19:49:07 +0200 (Tue, 25 Sep 2007) | 2 lines Changed paths: M /branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state - updated merge state ------------------------------------------------------------------------ These changes are not merged to branch http://svn.opensuse.org/svn/yast/trunk/bootloader, because - they were previously merged from the current branch' REV_COMMENT[41125]=' - these were previously merged from the current branch'