From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sat, 30 Oct 2021 01:34:04 +0300 From: Gleb Fotengauer-Malinovskiy To: ALT Linux Team development discussions Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WhE3e5bUPYA6a2hN" Content-Disposition: inline In-Reply-To: Subject: Re: [devel] nmap branching, newbie question, was: Fwd: [#282648] EPERM (try 6) nmap.git=7.80-alt2 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 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: Fri, 29 Oct 2021 22:34:38 -0000 Archived-At: List-Archive: List-Post: --WhE3e5bUPYA6a2hN Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Tue, Oct 26, 2021 at 11:04:43AM +0200, Pavel Nakonechnyi wrote: > =D0=94=D0=BE=D0=B1=D1=80=D1=8B=D0=B9 =D0=B4=D0=B5=D0=BD=D1=8C, >=20 > =D0=92 =D1=82=D0=B5=D0=BC=D1=83 =D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8 =D0= =BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9 =D0=B2=D0= =B5=D1=80=D1=81=D0=B8=D0=B8, =D0=BF=D0=BE =D0=B8=D1=81=D1=82=D0=BE=D1=80=D0= =B8=D0=B8 =D1=8F =D0=BD=D0=B5 =D1=81=D0=BC=D0=BE=D0=B3 =D0=BF=D0=BE=D0=BD= =D1=8F=D1=82=D1=8C =D0=BA=D0=B0=D0=BA=D0=B8=D0=BC > =D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=BC =D0=B1=D1=8B=D0=BB =D1=81=D0= =BE=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0=BD =D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0= =BE=D0=B4 =D1=81 7.70 =D0=B4=D0=BE 7.80. =D0=A7=D0=B5=D1=81=D1=82=D0=BD=D0=BE =D0=B3=D0=BE=D0=B2=D0=BE=D1=80=D1=8F, = =D1=8F =D1=83=D0=B6=D0=B5 =D0=B7=D0=B0=D0=B1=D1=8B=D0=BB, =D0=BA=D0=B0=D0= =BA =D1=81=D0=BE=D0=B1=D0=B8=D1=80=D0=B0=D0=BB=D1=81=D1=8F =D1=8D=D1=82=D0= =BE=D1=82 =D0=BF=D0=B0=D0=BA=D0=B5=D1=82. =D0=9E=D0=BA=D0=B0=D0=B7=D0=B0= =D0=BB=D0=BE=D1=81=D1=8C, =D1=82=D0=B0=D0=BA =D0=B6=D0=B5, =D0=BA=D0=B0=D0=BA =D1=8F =D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B8= =D0=B5 =D0=B3=D0=BE=D0=B4=D1=8B =D1=81=D0=BE=D0=B1=D0=B8=D1=80=D0=B0=D1=8E = =D0=B2=D1=81=D0=B5 =D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B, =D0=B2 =D0=BA=D0= =BE=D1=82=D0=BE=D1=80=D1=8B=D1=85 =D0=BF=D1=80=D0=B8=D1=85=D0=BE=D0=B4=D0= =B8=D1=82=D1=81=D1=8F =D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D1=8F=D1=82=D1=8C =D0=B8 =D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=B2=D0=B0=D1=82= =D1=8C =D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B5 =D0=BA=D0=BE=D0=BB=D0=B8= =D1=87=D0=B5=D1=81=D1=82=D0=B2=D0=BE =D0=BF=D0=B0=D1=82=D1=87=D0=B5=D0=B9. > =D0=AF =D0=BF=D1=80=D0=B5=D0=B4=D0=BF=D0=BE=D0=BB=D0=B0=D0=B3=D0=B0=D0=BB= =D1=81=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=D1=89=D0=B5=D0=B5: > - =D0=B2=D0=B5=D1=82=D0=BA=D0=B0 upstream =D0=B4=D0=BE=D0=BF=D0=BE=D0=BB= =D0=BD=D1=8F=D0=B5=D1=82=D1=81=D1=8F =D0=BE=D1=80=D0=B8=D0=B3=D0=B8=D0=BD= =D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=BC=D0=B8 =D0=B8=D1=81=D1=85=D0=BE=D0=B4= =D0=BD=D1=8B=D0=BC=D0=B8 =D0=BA=D0=BE=D0=B4=D0=B0=D0=BC=D0=B8 =D0=BD=D0=BE= =D0=B2=D0=BE=D0=B9 =D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8 > - =D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=B5=D1=82=D1=81=D1=8F =D0=BD=D0=BE=D0= =B2=D0=B0=D1=8F =D0=B2=D0=B5=D1=82=D0=BA=D0=B0, =D0=BD=D0=B0=D0=BF=D1=80=D0= =B8=D0=BC=D0=B5=D1=80 alt/7.92 =D0=BD=D0=B0 =D0=BE=D1=81=D0=BD=D0=BE=D0=B2= =D0=B5 upstream > - alt/7.92 =D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F=D0=B5=D1=82=D1=81= =D1=8F =D0=BF=D0=B0=D1=82=D1=87=D0=B0=D0=BC=D0=B8 =D0=BD=D0=B0 =D0=B8=D1=81= =D1=85=D0=BE=D0=B4=D0=BD=D0=B8=D0=BA=D0=B8 > - alt/7.92 =D0=B2=D0=BC=D0=B5=D1=80=D0=B6=D0=B8=D0=B2=D0=B0=D0=B5=D1=82= =D1=81=D1=8F =D0=B2 sisyphus =D1=81 =D1=82=D0=B5=D0=BC =D1=87=D1=82=D0=BE= =D0=B1=D1=8B =D0=BF=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81=D0=B0=D0=BB=D0=BE= =D1=81=D1=8C =D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=BC=D0=BE=D0=B5 > =D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=B8 nmap/ =D0=BD= =D0=B0 =D1=82=D1=80=D0=B5=D0=B1=D1=83=D0=B5=D0=BC=D0=BE=D0=B5 =D0=92=D1=81=D1=91 =D0=B2=D0=B5=D1=80=D0=BD=D0=BE, =D1=82=D0=B0=D0=BA =D0= =B8 =D0=B1=D1=8B=D0=BB=D0=BE =D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BE =D0= =BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5 =D0=B4=D0=BE 7.80= =2E =D0=9F=D0=BE =D1=82=D0=B0=D0=BA=D0=BE=D0=B9 =D0=B6=D0=B5 =D1=81=D1=85= =D0=B5=D0=BC=D0=B5 =D1=81=D0=BE=D0=B1=D1=80=D0=B0=D0=BD=D1=8B =D0=BC=D0=BD=D0=BE=D0=B3=D0=B8= =D0=B5 =D0=B4=D1=80=D1=83=D0=B3=D0=B8=D0=B5 =D0=BF=D0=B0=D0=BA=D0=B5=D1=82= =D1=8B. > =D0=98 =D0=B2=D0=BE=D1=82 =D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0= =B8=D0=B9 =D1=88=D0=B0=D0=B3 =D1=81=D0=BE=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0= =BD=D0=BD=D0=BE =D0=BD=D0=B5=D0=BF=D0=BE=D0=BD=D1=8F=D1=82=D0=B5=D0=BD. our= s =D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B5=D0=B3=D0=B8=D1=8F =D0=BD=D0=B5 =D0= =BF=D0=BE=D0=B4=D1=85=D0=BE=D0=B4=D0=B8=D1=82, > recursive (=D0=B8 =D0=B4=D1=80=D1=83=D0=B3=D0=B8=D0=B5) merge =D0=B2=D1= =8B=D0=B7=D1=8B=D0=B2=D0=B0=D0=B5=D1=82 =D0=BC=D0=B0=D1=81=D1=81=D1=83 =D0= =BA=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=BE=D0=B2. =D0=94=D0=B0 =D0= =B8 =D0=BF=D1=80=D0=B8 > =D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D0=B5 =D1=81 7.70 =D0=B4=D0=BE= 7.80 =D0=B1=D1=8B=D0=BB=D0=BE =D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BE = =D1=87=D1=82=D0=BE-=D1=82=D0=BE =D0=B8=D0=BD=D0=BE=D0=B5... > > =D0=9F=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B6=D0=B8=D1=82=D0=B5, =D0=BF=D0= =BE=D0=B6=D0=B0=D0=BB=D1=83=D0=B9=D1=81=D1=82=D0=B0, =D0=BA=D0=B0=D0=BA =D0= =BF=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0=D1=82=D1=8C =D0=B2 =D1=82=D0=B0=D0= =BA=D0=B8=D1=85 =D1=81=D0=BB=D1=83=D1=87=D0=B0=D1=8F=D1=85? =D0=94=D0=B0, =D0=B2 =D1=8D=D1=82=D0=BE=D0=BC =D0=BC=D0=B5=D1=81=D1=82=D0= =B5 =D0=BF=D1=80=D0=B8=D1=85=D0=BE=D0=B4=D0=B8=D1=82=D1=81=D1=8F =D0=BF=D1= =80=D0=B8=D0=BC=D0=B5=D0=BD=D1=8F=D1=82=D1=8C =D0=BD=D0=B5=D0=B1=D0=BE=D0= =BB=D1=8C=D1=88=D1=83=D1=8E =D1=85=D0=B8=D1=82=D1=80=D0=BE=D1=81=D1=82=D1= =8C, =D1=87=D1=82=D0=BE=D0=B1=D1=8B =D0=B2=D1=81=D0=B5 =D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B8=D0=BA=D0=B8 =D1=81=D0=BE=D0=B2= =D0=BF=D0=B0=D0=B4=D0=B0=D0=BB=D0=B8 =D1=81 =D0=BF=D0=BE=D0=B4=D0=B3=D0=BE= =D1=82=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC =D0=B1=D1=80=D0=B0= =D0=BD=D1=87=D0=B5=D0=BC, =D0=B0 .gear, spec =D0=B8 =D0=BE=D1=81=D1=82=D0= =B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5 =D1=84=D0=B0=D0=B9=D0=BB=D1=8B =D0=BE=D1=81=D1=82=D0=B0=D0=BB=D0=B8=D1=81= =D1=8C =D0=BD=D0=B0 =D0=BC=D0=B5=D1=81=D1=82=D0=B5. =D0=AF =D0=B4=D0=B5=D0= =BB=D0=B0=D1=8E =D1=8D=D1=82=D0=BE =D1=82=D0=B0=D0=BA: git merge -s ours --no-commit alt/7.80 git read-tree alt/7.80 git checkout @ -- .gear/ alt/ git commit git reset --hard On Thu, Oct 28, 2021 at 09:11:30PM +0300, Vitaly Lipatov wrote: > =D0=95=D1=81=D0=BB=D0=B8 =D0=B1=D1=8B =D0=B1=D1=8B=D0=BB=D0=B0 =D0=B2=D0= =BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C, =D1=8F =D0=B1=D1= =8B =D0=BE=D0=B1=D1=8A=D1=8F=D1=81=D0=BD=D1=8F=D0=BB =D0=BC=D0=B0=D0=BD=D1= =82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D1=83, =D1=87=D1=82=D0=BE =D0=BD=D0=B5 = =D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20 > =D1=81=D0=BE=D0=B1=D0=B8=D1=80=D0=B0=D1=82=D1=8C =D0=BF=D0=B0=D0=BA=D0=B5= =D1=82=D1=8B =D0=BD=D0=B0 =D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=B5 =D0=B0=D0=BF= =D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=BD=D1=8B=D1=85 =D1=80=D0=B5=D0=BF=D0=BE= =D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D0=B5=D0=B2, =D0=B0 =D0=BD=D1=83=D0=B6= =D0=BD=D0=BE =D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0= =D1=82=D1=8C=20 > =D0=BE=D1=84=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE =D0=BE=D0=BF= =D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5 = =D1=82=D0=B0=D1=80=D0=B1=D0=BE=D0=BB=D1=8B. > =D0=A2=D0=BE=D0=B3=D0=B4=D0=B0 =D0=B8 =D0=BD=D0=B5 =D0=B1=D1=83=D0=B4=D0= =B5=D1=82 =D1=82=D0=B0=D0=BA=D0=B8=D1=85 =D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0= =B5=D0=BC =D0=B8 =D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D1=85 =D0=B4=D0=B5=D0=B9=D1= =81=D1=82=D0=B2=D0=B8=D0=B9. =D0=A1=D1=82=D1=80=D0=B0=D0=BD=D0=BD=D0=BE, =D1=8D=D1=82=D0=BE=D1=82 =D0=BF= =D0=B0=D0=BA=D0=B5=D1=82 =D0=BA=D0=B0=D0=BA =D1=80=D0=B0=D0=B7 =D1=81=D0=BE= =D0=B1=D1=80=D0=B0=D0=BD =D0=B8=D0=B7 =D0=BE=D0=BF=D1=83=D0=B1=D0=BB=D0=B8= =D0=BA=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE =D1=82=D0=B0=D1=80= =D0=B1=D0=BE=D0=BB=D0=BB=D0=B0. --=20 glebfm --WhE3e5bUPYA6a2hN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJhfHbcAAoJEEyKfkRpkCv5CqQP/i0d9G9BmhWKqTxfMtRfBy0i EG1foP7eSu3W8y7ALd6eMK8w26l3Eve/3Fp3gcOkc1kTcshIzidS5vuj5RFMikuD xhwfrCvcydqfn0/r2+J9ulwp+zYp4rLDRVWDapv6bpGRH/eiY1vT+uNxCKyMA0Io 2Ce8s+Mnog5EwvuHRBgSKjlKHCKrVo2DUW0fwSQsWDHCyDRbrqeX8QBo17f7vO9c qwvOS7fAq/PY4eamIbfYNLRHeE/HVlKqO7htnkMpLFtUtih2ORS6tT+xN3mW95U7 X4CASgW7DG9rQj3UEF6SL7rc/AcNv1BIyWoNKZyRFPR7dOMSBPD7zKvWdyfEPPhf L98SELXjmR9oTy1Sofgzr7HIczgLFzsHRlcgigJDuQlRSDslFeLCzbiGvlV+4O3j TjnCfL94+kwHyzfjZYmC3ybrpyT9no8Xw9JNDXK+pC+Y/jBvsK2f2+B2/SAZCIPq fB+xHUw1RHL/dMaSpY/gOdeKosJIgiwGRK3TrCDS3cGrUtjHGpl2d6o2wtUI9a9g jlQc50Lj7YKxSn52yEvjup4xxGuV1co22tSl1sRDN5syEGqFiI3yr1iDFjHmYe7e +5CEQY/CpigrS8UwIaH8v6gdEgmL5F4a9X8Nco5uX+KQihwR8R7amhjIDRkkBDg4 ORMy9aWHu9JQfpZQJ9Sq =vktH -----END PGP SIGNATURE----- --WhE3e5bUPYA6a2hN--