From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: To: ALT Devel discussion list Organization: Tyumen's University, Institute of Distance Education References: <461A80BC.30606@stc.donpac.ru> <20070409191917.GR9264@solemn.turbinal> <461B3243.3040108@stc.donpac.ru> <461B3874.8040201@stc.donpac.ru> <461C84C9.3020305@stc.donpac.ru> <461CBF85.1000509@stc.donpac.ru> From: "Vladimir V. Kamarzin" Date: Thu, 12 Apr 2007 16:23:21 +0600 In-Reply-To: <461CBF85.1000509@stc.donpac.ru> (Eugene Prokopiev's message of "Wed, 11 Apr 2007 14:59:17 +0400") Message-ID: User-Agent: Gnus/5.1007 (Gnus v5.10.7) XEmacs/21.5-b27 (linux) MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 8bit X-Virus-Scanned: Scanned by clamav Subject: Re: [devel] =?koi8-r?b?5d3FIM/Ezs8gSE9XVE8g0NLPINPCz9LL1SDQwcvF1MEg?= =?koi8-r?b?1yBnaXQuYWx0IMkgyc7UxcfSwcPJwCDTIHVwc3RyZWFtIHNjbQ==?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2007 10:24:15 -0000 Archived-At: List-Archive: List-Post: >>>>> On 11 Apr 2007 at 16:59 "EP" == Eugene Prokopiev writes: EP> Сделал так: EP> $ git-branch EP> srpms EP> $ git-svn init EP> https://libsieve.svn.sourceforge.net/svnroot/libsieve/branches/libsieve_2_2_branch EP> $ git-svn fetch EP> Fetching git-svn EP> A libsieve2/www/example.php EP> ... EP> M libsieve2/Makefile EP> r110 = 15ef41ffd4d2e52cee5ae30dba1de1ee47b16c84 EP> $ git-branch EP> * master EP> srpms EP> $ git-checkout srpms EP> Switched to branch "srpms" EP> $ ls EP> libsieve libsieve.spec EP> $ git-checkout master EP> Switched to branch "master" EP> $ ls EP> libsieve2 EP> И что все это означает? Не понял вопроса. EP> Еще интереснее: EP> $ git-checkout master EP> Switched to branch "master" EP> $ head -n 1 libsieve2/NEWS EP> libSieve 2.2.5 EP> $ git-checkout srpms EP> Switched to branch "srpms" EP> $ head -n 1 libsieve/NEWS EP> libSieve 2.2.4 EP> Т.е. вроде в бранч master попало то, что надо, а что тогда попало в EP> бранч srpms? Ничего не попало. Вы же не делали ни merge ни pull :) -- vvk