Re: gdb_7_3-branch not buildable?

[Jim Meyering <jim at meyering dot net>]

Joel Brobecker wrote:
>> > Andreas, could you say what you did to make yours better?
>>
>> Handcraft.  These are things that something based on cvsps cannot do
>> better.
>
> Can we take your branch and force-push it? If we could do that
> without confusing cvsps, that'd be awesome. git really has become
> a significant time saver, and not having a correct mirror of the
> branch would mean a lot of work on my end.

Hi Joel,

I've adjusted git's gdb_7_3-branch so that it is much closer to cvs now.
Diffs below.

For the record, I've done the following in a local, private clone.

  # Rebase to proper branch point:
  git tag gdb_7_3-2011-04-01-branchpoint c73dde705c3b163b5101ed4cc4506cef6cc58905
  git branch --track v7.3 remotes/origin/gdb_7_3-branch && git co v7.3
  git rebase --onto gdb_7_3-2011-04-01-branchpoint master v7.3

  # Update the mirror repo used to sync from cvs:
  git push ~/mirror-git-to-cvs/repo/src +v7.3:gdb_7_3-branch
  git push ~/mirror-git-to-cvs/repo/src tag gdb_7_3-2011-04-01-branchpoint

In a few minutes the twice-hourly sync-from-cvs script
will run and push that result to the public git repository.

==============================================
With that, here is the result of comparing the latest checked-out/cloned
directories from cvs and git:

Only in gdb-cvs: contrib
diff -u -r -x.git -xCVS gdb/gdb/doc/stabs.texinfo gdb-cvs/gdb/doc/stabs.texinfo
--- gdb/gdb/doc/stabs.texinfo	2011-05-02 18:47:22.530555384 +0000
+++ gdb-cvs/gdb/doc/stabs.texinfo	2011-01-05 05:09:54.000000000 +0000
@@ -40,7 +40,7 @@
 @page
 @tex
 \def\$#1${{#1}}  % Kluge: collect RCS revision info without $...$
-\xdef\manvers{\$Revision$}  % For use in headers, footers too
+\xdef\manvers{\$Revision: 2.130 $}  % For use in headers, footers too
 {\parskip=0pt
 \hfill Cygnus Support\par
 \hfill \manvers\par
diff -u -r -x.git -xCVS gdb/gdb/gdb.1 gdb-cvs/gdb/gdb.1
--- gdb/gdb/gdb.1	2011-05-02 18:47:22.581555645 +0000
+++ gdb-cvs/gdb/gdb.1	2011-01-05 05:09:51.000000000 +0000
@@ -1,6 +1,6 @@
 .\" Copyright (C) 1991, 1999, 2010, 2011 Free Software Foundation, Inc.
 .\" See section COPYING for conditions for redistribution
-.\" $Id$
+.\" $Id: gdb.1,v 1.4 1999/01/05 00:50:50 jsm Exp $
 .TH gdb 1 "22may2002" "GNU Tools" "GNU Tools"
 .SH NAME
 gdb \- The GNU Debugger
Only in gdb-cvs/gdb/testsuite/gdb.ada: mi_catch_ex
Only in gdb: .gitignore