From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 From: Sergey V Turchin To: ALT Linux Team development discussions Date: Thu, 20 Oct 2011 17:36:02 +0400 Message-ID: <3655701.2C40lp2m8m@summoner.localdomain> User-Agent: KMail/4.7.2 (Linux/3.0.6-std-def-alt1; KDE/4.7.2; i686; ; ) In-Reply-To: <1319116494.16957.61.camel@arisbook> References: <20111018230155.GB32767@altlinux.org> <1399528.rJQy5IXnGl@summoner.localdomain> <1319116494.16957.61.camel@arisbook> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2628720.xZg1ipW1MY"; micalg="pgp-sha1"; protocol="application/pgp-signature" Subject: [devel] =?utf-8?b?0L/RgNC40LXQvNGLIGdlYXIgKHdhczogQGdub21lINC4?= =?utf-8?b?IHNoYWJhQCAod2FzOiBSZTogW2RldmVsLWFubm91bmNlXSBJOiBnaXQu?= =?utf-8?q?alt_task_check-git-inheritance=29=29?= 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: Thu, 20 Oct 2011 13:36:23 -0000 Archived-At: List-Archive: List-Post: --nextPart2628720.xZg1ipW1MY Content-Type: multipart/mixed; boundary="nextPart8815886.pGyWOaspyJ" Content-Transfer-Encoding: 7Bit --nextPart8815886.pGyWOaspyJ Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8" T24gMjAg0L7QutGC0Y/QsdGA0Y8gMjAxMSAxNzoxNDo1NCBZdXJpIE4uIFNlZHVub3Ygd3JvdGU6 CgpbLi4uXQo+INCe0L/Rg9Cx0LvQuNC60YPQuSDQv9GA0LjQtdC80YssINC80L7QttC10YIg0L/R gNC40LPQvtC00Y/RgtGB0Y8uCtCn0YLQviDRgSDRhdC+0LTRgyDQstGB0L/QvtC80L3QuNC70L7R gdGMOgotINGH0YLQvtCxINC90LUg0L/QvtC70YzQt9C+0LLQsNGC0YzRgdGPIGdlYXItdXBkYXRl LXRhZyDQvdGD0LbQvdC+INC00LXRgNC20LDRgtGMINCy0YHQtSDRgdCy0L7QtSDQsiDQvtC00L3Q vtC5INCy0LXRgtC60LUg0YEgCtC40YHRhdC+0LTQvdC40LrQsNC80LguINCf0YDQuCDRjdGC0L7Q vCAuZ2Vhci9ydWxlcyDQsdGD0LTQtdGCINCy0YvQs9C70Y/QtNC10YLRjCDQvdCwINC80LDQvdC1 0YA6CmNvcHk6IGFsdGxpbnV4LyoKdGFyOiAuIG5hbWU9cGtnbmFtZS1AdmVyc2lvbkAKc3BlYzog YWx0bGludXgvcGtnbmFtZS5zcGVjCi0g0YHQvNC10YDQttC40YLRjCDQsiDRgtC10LrRg9GJ0LXQ tSDQtNC10YDQtdCy0L4g0LLRgdC1LCDRh9GC0L4g0YPQs9C+0LTQvdC+INC/0L7QstC10YDRhSDR gSDRgdC+0YXRgNCw0L3QtdC90LjQtdC8INC40YHRgtC+0YDQuNC4INC80L7QttC90L4gCtC/0YDQ uNC60YDQtdC/0LvQtdC90L3Ri9C8INCy0L7Qu9GI0LXQsdC90YvQvCDRgdC60YDQuNC/0YLQvtC8 INC+0YIgc2JvbHNoYWtvdkBhbHQuINCc0L3QtSDRgtCw0LrQvtC1INC/0YDQuNCz0L7QttC00LDQ tdGC0YHRjyDQv9GA0LggCtC+0LHQvdC+0LLQu9C10L3QuNC4IHF0INC4IGtkZSwg0LrQvtCz0LTQ sCDRgSDRgtGN0LPQsCDQvtC00L3QvtC5INCy0LXRgNGB0LjQuCDQvdC1INC80LXRgNC20LjRgtGM 0YHRjyDQtNC+INC00YDRg9Cz0L7Qs9C+LCDRgi7Qui4g0YMgCtC90LjRhSDRjdGC0L4g0YDQsNC3 0L3Ri9C1INCy0LXRgtC60LguCgo+ID4gUC5QLlMuCj4gPiDQryDQtNCw0LbQtSDQuNC3IHNyYy5y cG0g0L/QviDRgdC10LnRh9Cw0YHQvdC+0LzRgyDQvdC1INGD0LzQtdGOINGB0L7QsdC40YDQsNGC 0YwuCj4g0JAg0Y8g0Lgg0YLQsNC6INC4INGB0Y/QuiDRg9C80LXRjiwg0LrQvtCz0LTQsCDQtNC1 0LnRgdGC0LLQuNGC0LXQu9GM0L3QviDQvdCw0LTQvi4K0JTRi9C6LCDQv9C10YDQtdGF0L7QtNC4 INGD0LbQtSDRgdC+0LLRgdC10LwsINGH0YLQvtCxINC90LUg0LzRg9GH0LjRgtGM0YHRjy4KCi0t IApSZWdhcmRzLCBTZXJnZXkuICAgICAgIEFMVCBMaW51eCwgaHR0cDovL3d3dy5hbHRsaW51eC5y dS8= --nextPart8815886.pGyWOaspyJ Content-Disposition: attachment; filename="git-merge-theirs" Content-Transfer-Encoding: 7Bit Content-Type: application/x-shellscript; name="git-merge-theirs" #!/bin/sh THEIR_REF="$1" # what to merge THEIR_COMM=`git rev-parse "$THEIR_REF^{commit}"` OURS=`git rev-parse HEAD` THEIR_TREE=`git rev-parse "$THEIR_COMM^{tree}"` MERGECOMMIT=`echo "Merge branch $THEIR_REF with -s theirs" | git commit-tree "$THEIR_TREE" -p "$OURS" -p "$THEIR_COMM"` git update-ref -m "Merging $THEIR_REF with -s theirs" HEAD "$MERGECOMMIT" "$OURS" --nextPart8815886.pGyWOaspyJ-- --nextPart2628720.xZg1ipW1MY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk6gI9EACgkQ+zBIrxwqPwjU5ACfYnR0GS06tSBjiS5IAgK1S15k vUIAnjL7mCbDAymqrFdpk7fAginIZYhW =L4Fy -----END PGP SIGNATURE----- --nextPart2628720.xZg1ipW1MY--