From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vvk@vvk.pp.ru>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham
	version=3.2.5
To: ALT Devel discussion list <devel@lists.altlinux.org>
Organization: Tyumen State University
References: <20081016080045.36F1D45D805B@ssh.git.int.altlinux.org>
From: "Vladimir V. Kamarzin" <vvk@vvk.pp.ru>
Date: Thu, 16 Oct 2008 14:26:54 +0600
In-Reply-To: <20081016080045.36F1D45D805B@ssh.git.int.altlinux.org> (Anton
	Protopopov's message of "Thu, 16 Oct 2008 12:00:44 +0400 (MSD)")
Message-ID: <m3wsg92be9.fsf@vvk.distance.ru>
User-Agent: Gnus/5.1007 (Gnus v5.10.7) XEmacs/21.5-b28 (linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-5
Content-Transfer-Encoding: quoted-printable
X-Virus-Scanned: ClamAV using ClamSMTP
Subject: Re: [devel] [SCM] packages/vzctl: heads/master
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.10b3
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Oct 2008 08:27:02 -0000
Archived-At: <http://lore.altlinux.org/devel/m3wsg92be9.fsf@vvk.distance.ru/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

>>>>> On 16 Oct 2008 at 14:00 "AP" =3D=3D Anton Protopopov writes:

AP> commit 07afa93c1a0f33e526535e129f8901c706dc9d5f
AP> Author: Anton Protopopov <aspsk@altlinux.org>
AP> Date:   Thu Oct 16 10:50:35 2008 +0400

AP>     Repair commits, died during previous merge
=20=20=20=20
AP>     - commit ac17387e79689e8d20e2b1f9488fb506111625c3
AP>       (vzmigrate.in: Add -x to rsync options)
=20=20=20=20
AP>     Conflicts:
AP>     	bin/vzmigrate.in

[...]

AP> -RSYNC_OPTIONS=3D"-aH --delete --numeric-ids"
AP> +RSYNC_OPTIONS=3D"-axH --delete --numeric-ids"
AP>  RSYNC=3D"rsync $RSYNC_OPTIONS"
=20
=BE=E7=D5=DD=EC =E5=DE=E7=D5=E2=E1=EF "A" =D2 =D4=D5=E4=DE=DB=E2=DD=EB=E5 =
=DE=DF=E6=D8=EF=E5 rsync =D8=DB=D8 =D2=DE=D7=DC=DE=D6=DD=DE=E1=E2=EC =DF=D5=
=E0=D5=DE=DF=E0=D5=D4=D5=DB=EF=E2=EC =ED=E2=D8
=DE=DF=E6=D8=D8 =D2 =DE=E2=D4=D5=DB=EC=DD=DE=DC =DA=DE=DD=E4=D8=D3=D5.

--=20
vvk