From mboxrd@z Thu Jan 1 00:00:00 1970 From: smurf@smurf.noris.de Subject: [PATCH] cvsimport: Remove master-updating code Date: Tue, 7 Mar 2006 10:08:34 +0100 Message-ID: <20060307090834.GX13888@smurf.noris.de> References: <44094618.6070404@asianetindia.com> <46a038f90603060124h4ea1c3c6gaa5d8b52ed311230@mail.gmail.com> <46a038f90603060137o758ea7ch6c40652ad86a102a@mail.gmail.com> <440C68B9.9030305@asianetindia.com> <7vek1e6cnk.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eWbcAUUbgrfSEG1c" Cc: Rajkumar S , git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Mar 07 10:15:34 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FGYHy-0005ep-NE for gcvg-git@gmane.org; Tue, 07 Mar 2006 10:15:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752014AbWCGJPR (ORCPT ); Tue, 7 Mar 2006 04:15:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752026AbWCGJPQ (ORCPT ); Tue, 7 Mar 2006 04:15:16 -0500 Received: from run.smurf.noris.de ([192.109.102.41]:26817 "EHLO smurf.noris.de") by vger.kernel.org with ESMTP id S1752014AbWCGJPP (ORCPT ); Tue, 7 Mar 2006 04:15:15 -0500 Received: from smurf by smurf.noris.de with local (Exim 4.60) (envelope-from ) id 1FGYBG-0005v2-Pq; Tue, 07 Mar 2006 10:08:34 +0100 To: Junio C Hamano Content-Disposition: inline In-Reply-To: <7vek1e6cnk.fsf@assigned-by-dhcp.cox.net> User-Agent: Mutt/1.5.9i Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --eWbcAUUbgrfSEG1c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The code which tried to update the master branch was somewhat broken. =3D> People should do that manually, with "git merge". Signed-off-by: Matthias Urlichs --- Junio C Hamano: > I do not understand what cvsimport is trying to do here; I > _suspect_ the part that updates the "master" branch head might > be a bug. >=20 This should fix it. --- Documentation/git-cvsimport.txt | 6 ++++++ git-cvsimport.perl | 27 ++------------------------- 2 files changed, 8 insertions(+), 25 deletions(-) 4c28ef8000d68a0736084022a047019dca96c823 diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.= txt index dfe86ce..57027b4 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -22,6 +22,12 @@ repository, or incrementally import into Splitting the CVS log into patch sets is done by 'cvsps'. At least version 2.1 is required. =20 +You should *never* do any work of your own on the branches that are +created by git-cvsimport. The initial import will create and populate a +"master" branch from the CVS repository's main branch which you're free +to work with; after that, you need to 'git merge' incremental imports, or +any CVS branches, yourself. + OPTIONS ------- -d :: diff --git a/git-cvsimport.perl b/git-cvsimport.perl index b46469a..02d1928 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -452,7 +452,6 @@ chdir($git_tree); =20 my $last_branch =3D ""; my $orig_branch =3D ""; -my $forward_master =3D 0; my %branch_date; =20 my $git_dir =3D $ENV{"GIT_DIR"} || ".git"; @@ -488,21 +487,6 @@ unless(-d $git_dir) { $last_branch =3D "master"; } $orig_branch =3D $last_branch; - if (-f "$git_dir/CVS2GIT_HEAD") { - die <