From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 10 Feb 2009 17:46:07 +0300 From: "Dmitry V. Levin" To: ALT Linux Team development discussions Message-ID: <20090210144607.GB28187@wo.int.altlinux.org> Mail-Followup-To: ALT Linux Team development discussions References: <4990B377.4000909@solin.spb.ru> <20090209230917.GB20017@wo.int.altlinux.org> <4990BEE1.4020108@solin.spb.ru> <49913672.8010804@solin.spb.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QTprm0S8XgL7H0Dt" Content-Disposition: inline In-Reply-To: <49913672.8010804@solin.spb.ru> X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E Subject: Re: [devel] I: nut-2.2.2 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.10b3 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2009 14:46:07 -0000 Archived-At: List-Archive: List-Post: --QTprm0S8XgL7H0Dt Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 10, 2009 at 11:10:26AM +0300, Aleksey Avdeev wrote: > Eugene Prokopiev =D0=C9=DB=C5=D4: > >>=FC=D4=CF =D3=C4=C5=CC=C1=CE=CF =C4=CC=D1 =C4=CF=C2=C1=D7=CC=C5=CE=C9= =D1 =D7 =D3=D0=C5=CB=20 > >>=CB=CF=CE=D3=D4=D2=D5=CB=C3=C9=C9 =D3 =CF=D4=C4=C5=CC=D8=CE=CF=CA =C9= =D3=D4=CF=D2=C9=C5=CA > >>(=C1=D7=D4=CF=CD=C1=D4=C9=DA=C1=C3=C9=C9 =D7=D9=DE=C9=D3=CC=C5=CE=C9=D1= =D0=D2=C1=D7=C9=CC=D8=CE=CF=C7=CF=20 > >>=D2=C5=CC=C9=DA=C1, =D7 =DA=C1=D7=C9=D3=C9=CD=CF=D3=D4=C9 =CF=D4 =D4=D2= =C5=C2=D5=C5=CD=CF=C7=CF > >>=C2=D2=C1=CE=DE=C1). =F7 =C4=C1=CC=D8=CE=C5=CA=DB=C5=CD -- =D0=CF=DA=D7= =CF=CC=C9=D4=20 > >>=CF=C2=CE=CF=D7=CC=D1=D4=D8 =C4=C1=CE=CE=D5=C0 =CB=CF=CE=D3=D4=D2=D5=CB= =C3=C9=C0 (=D0=D2=C9 > >>=D0=CF=D1=D7=CC=C5=CE=C9=C9 =CE=CF=D7=D9=C8 =C2=D2=C1=CE=DE=C5=CA) =D0= =D2=CF=D3=D4=D9=CD=20 > >>=CF=C2=D2=C1=DA=CF=CD, =DE=C5=D2=C5=DA git pull. (=F0=D2=C9=CD=C5=D2 = =D4=C1=CB=CF=C7=CF > >>=CF=C2=CE=CF=D7=CC=C5=CE=C9=D1, =C4=CF=C2=C1=D7=CC=C5=CE=C9=C5 =D0=CF= =C4=C4=C5=D2=D6=CB=C9 M50, =CB=C1=CB=20 > >>=D2=C1=DA =C9 =D0=D2=C9=D7=CC=A3=CB =D4=D7=CF=A3 =D7=CE=C9=CD=C1=CE=C9= =C5 =D7=D9=DB=C5.) > > > >=E1 =CE=C1=D3=CB=CF=CC=D8=CB=CF =DC=D4=C1 =CB=CF=CE=D3=D4=D2=D5=CB=C3=C9= =D1 =D3=CF=D7=CD=C5=D3=D4=C9=CD=C1=20 > >=D3 =CE=CF=D7=CF=CA =D3=C2=CF=D2=CF=DE=CE=CF=CA =D3=C9=D3=D4=C5=CD=CF=CA, > >=CB=CF=D4=CF=D2=C1=D1 =D7=D3=C5 =D2=C1=D7=CE=CF =D4=D2=C5=C2=D5=C5=D4 = =D1=D7=CE=D9=C8 =D2=C1=DA=CE=D9=C8=20 > >=CB=CF=CD=CD=C9=D4=CF=D7 =C4=CC=D1 =D2=C1=DA=CE=D9=C8 =C2=D2=C1=CE=DE=C5= =CA? >=20 > =F0=CF=CC=CE=CF=D3=D4=D8=C0 =D3=CF=D7=CD=C5=D3=D4=C9=CD=C1: =C2=D2=C1= =CE=DE =C4=CC=D1=20 > =C2=DC=CB=D0=CF=D2=D4=C1 =CB=CF=CE=C5=DE=CE=CF =D0=CF=D4=D2=C5=C2=D5=C5= =D4=D3=D1, =CE=CF=20 > =CF=C2=CE=CF=D7=CC=D1=D4=D8 =C5=C7=CF =CD=CF=D6=CE=CF =DE=C5=D2=C5=DA git= pull =D3 =D0=D2=CF=D3=D4=D9=CD=20 > =CB=CF=CE=C6=CC=C9=CB=D4=CF=CD (=D7 %changelog). >=20 > =EE=C5=C2=CF=CC=D8=DB=C1=D1 =C4=C5=CD=CF=CE=D3=D4=D2=C1=C3=C9=D1 =CE=C1= =D0=D2=C9=CD=C5=D2=C5=20 > =C2=D2=C1=CE=DE=C5=CA demo/master (=D3=CD.=20 > )=20 > =C9 demo/4.0 (=D3=CD.=20 > ): >=20 > 1. =FA=C1=D7=CF=D6=D5 =C4=C5=CD=CF=CE=D3=D4=D2=C1=C3=C9=CF=CE=CE=D9=CA = =C2=D2=C1=CE=DE demo/master =C9=20 > =CF=C2=CE=CF=D7=CC=D1=C0 =D7 =CE=A3=CD =D3=D0=C5=CB =C4=CF: >=20 > $ git-diff master demo/master|cat > diff --git a/nut.spec b/nut.spec > index 8ea317b..fba4aa5 100644 > --- a/nut.spec > +++ b/nut.spec > @@ -3,7 +3,7 @@ > # for set release > %define release_pre alt > %define release_base_num 1 > -%define release_base_num2 1 > +%define release_base_num2 2 > %define release_suff %nil >=20 > # for distr selected > @@ -629,6 +629,10 @@ fi > %_man3dir/* >=20 > %changelog > +* Tue Feb 10 2009 Aleksey Avdeev 2.2.2-alt1.2 > +- NMU > +- For backports demonstration. > + > * Mon Feb 09 2009 Aleksey Avdeev 2.2.2-alt1.1 > - NMU >=20 > 2. =FA=C1=D7=CF=D6=D5 =C4=C5=CD=CF=CE=D3=D4=D2=C1=C3=C9=CF=CE=CE=D9=CA = =C2=D2=C1=CE=DE demo/4.0: >=20 > $ git-checkout -b demo/4.0 4.0 >=20 > 3. $ git-pull . demo/master > Auto-merged nut.spec > CONFLICT (content): Merge conflict in nut.spec > Automatic merge failed; fix conflicts and then commit the result. >=20 > =C1) =D0=CF=CC=D5=DE=C1=C5=CD =CF=C2=C5=DD=C1=CE=CE=D9=CA =CB=CF=CE=C6=CC= =C9=CB=D4: >=20 > %changelog > <<<<<<< HEAD:nut.spec > * Mon Feb 09 2009 Aleksey Avdeev 2.2.2-alt1.0.M40.1 > - NMU > - Backports to 4.0 > =3D=3D=3D=3D=3D=3D=3D > * Tue Feb 10 2009 Aleksey Avdeev 2.2.2-alt1.2 > - NMU > - For backports demonstration. > >>>>>>> 2c105c94d9dd31a8be3d2515764216d9ac115d69:nut.spec >=20 > * Mon Feb 09 2009 Aleksey Avdeev 2.2.2-alt1.1 > - NMU >=20 > =C2) =D2=C5=DB=C1=C5=CD =C5=C7=CF (=C9 =CF=C2=CE=CF=D7=CC=D1=D1 =D2=C5=CC= =C9=DA/=C4=C1=D4=D5) =C9=20 > =CB=CF=CD=C9=D4=C9=CD. >=20 > 3. =EE=C1 =D7=D9=C8=CF=C4=C5 -- =CB=CF=D2=D2=C5=CB=D4=CE=D9=CA =C2=DC=CB= =D0=CF=D2=D4: >=20 > $ git-diff 4.0 demo/4.0|cat > diff --git a/nut.spec b/nut.spec > index b2dfdce..e6df0d2 100644 > --- a/nut.spec > +++ b/nut.spec > @@ -3,7 +3,7 @@ > # for set release > %define release_pre alt > %define release_base_num 1 > -%define release_base_num2 1 > +%define release_base_num2 2 > %define release_suff %nil >=20 > # for distr selected > @@ -629,10 +629,17 @@ fi > %_man3dir/* >=20 > %changelog > -* Mon Feb 09 2009 Aleksey Avdeev 2.2.2-alt1.0.M40.1 > +* Tue Feb 10 2009 Aleksey Avdeev 2.2.2-alt1.1.M40.1 > - NMU > - Backports to 4.0 >=20 > +* Tue Feb 10 2009 Aleksey Avdeev 2.2.2-alt1.2 > +- NMU > +- For backports demonstration. > + > * Mon Feb 09 2009 Aleksey Avdeev 2.2.2-alt1.1 > - NMU >=20 > --=20 >=20 > =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD. =E1=CC=C5=CB=D3=C5=CA. =EF=DE=C5=CE=D8 =D3=CC=CF=D6=CE=CF =C9 =CF=DE=C5=CE=D8 =CE=C5=D5=C4=CF=C2= =CE=CF. =EE=C5=D4, =DC=D4=CF =D5=D6=C1=D3=CE=CF. --=20 ldv --QTprm0S8XgL7H0Dt Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkmRky8ACgkQfKvmrJ41Nh4hAwCgpWjCOB7e9DctP971ZEmLqG+r EHAAoLOQ+fjXFIJXXz9JJC7ZBF9gTeZb =hJtk -----END PGP SIGNATURE----- --QTprm0S8XgL7H0Dt--