Author: odabrunz Date: Fri Jul 20 17:34:25 2007 New Revision: 39574 URL: http://svn.opensuse.org/viewcvs/yast?rev=39574&view=rev Log: - caught up merging all other branches 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=39574&r1=39573&r2=39574&view=diff ============================================================================== --- trunk/bootloader/y2_checkin.state (original) +++ trunk/bootloader/y2_checkin.state Fri Jul 20 17:34:25 2007 @@ -2,20 +2,20 @@ # 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 0 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 0 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 0 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-Branch/bootloader 0 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 0 +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-SLE-10-Branch/bootloader 31732 +http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 37794 # revisions seen: # -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-SLE-10-Branch/bootloader -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader +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-SLE-10-Branch/bootloader 31508 31536 31598 31728 31732 +http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 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 # revisions postponed: @@ -29,9 +29,33 @@ # 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org