Author: odabrunz Date: Thu Oct 11 15:18:39 2007 New Revision: 41376 URL: http://svn.opensuse.org/viewcvs/yast?rev=41376&view=rev Log: - updated merge state file Modified: trunk/bootloader/y2_checkin.state Modified: trunk/bootloader/y2_checkin.state URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/y2_checkin.state?rev=41376&r1=41375&r2=41376&view=diff ============================================================================== --- trunk/bootloader/y2_checkin.state (original) +++ trunk/bootloader/y2_checkin.state Thu Oct 11 15:18:39 2007 @@ -6,9 +6,9 @@ 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 41092 +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 41083 +http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41157 # revisions seen: # @@ -16,9 +16,9 @@ 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 +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 +http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41157 # revisions postponed: # @@ -32,82 +32,84 @@ # 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[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. @@ -152,3 +154,5 @@ 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' + -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org