Re: [Nano-devel] different authors between svn and git

[Mike Frysinger]

On 07 Apr 2016 15:17, Benno Schulenberg wrote:
> I've looked a bit at git blame, and compared it with svn blame,
> just for the src/*.c files.
> 
> It seems that things that were ascribed to Jordi are now ascribed
> to Chris.  In SVN some two thousand lines were "blamed" on Jordi,
> and now... just four -- four debugging messages.
> 
> Is git better at ignoring whitespace changes?  Or does git recognize
> that some blocks of lines are just copies of others and ascribes them
> to the original author instead of to the copier?

i think the git repo is more correct.  svn doesn't handle renames and
such all that well.  if i look at src/winio.c for example, the first
few lines show:

$ git blame src/winio.c | head
^a2ea193 winio.c     (Chris Allegretta      2000-06-06 05:53:49 +0000    1) 
/**************************************************************************
^a2ea193 winio.c     (Chris Allegretta      2000-06-06 05:53:49 +0000    2)  *  
 winio.c                                                              *
^a2ea193 winio.c     (Chris Allegretta      2000-06-06 05:53:49 +0000    3)  *  
                                                                      *
8a07a96e src/winio.c (Chris Allegretta      2009-12-02 03:36:22 +0000    4)  *  
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
7a9f4a45 src/winio.c (Benno Schulenberg     2014-04-30 20:18:26 +0000    5)  *  
 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
^a2ea193 winio.c     (Chris Allegretta      2000-06-06 05:53:49 +0000    6)  *  
 This program is free software; you can redistribute it and/or modify *
^a2ea193 winio.c     (Chris Allegretta      2000-06-06 05:53:49 +0000    7)  *  
 it under the terms of the GNU General Public License as published by *
d0035b4a src/winio.c (David Lawrence Ramsey 2007-08-11 05:17:36 +0000    8)  *  
 the Free Software Foundation; either version 3, or (at your option)  *
^a2ea193 winio.c     (Chris Allegretta      2000-06-06 05:53:49 +0000    9)  *  
 any later version.                                                   *
^a2ea193 winio.c     (Chris Allegretta      2000-06-06 05:53:49 +0000   10)  *  
                                                                      *

compared to svn:

$ svn blame src/winio.c | head
  1543      jordi /* $Id$ */
  1543      jordi 
/**************************************************************************
  1543      jordi  *   winio.c                                                  
            *
  1543      jordi  *                                                            
            *
  4453   astyanax  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 
2006, 2007,  *
  4826       bens  *   2008, 2009, 2010, 2011, 2013, 2014 Free Software 
Foundation, Inc.    *
  1543      jordi  *   This program is free software; you can redistribute it 
and/or modify *
  1543      jordi  *   it under the terms of the GNU General Public License as 
published by *
  4147   dolorous  *   the Free Software Foundation; either version 3, or (at 
your option)  *
  1543      jordi  *   any later version.                                       
            *

commit a2ea193 is the initial import while commit r1543 is file shuffling.

$ svn log -r1543
------------------------------------------------------------------------
r1543 | jordi | 2003-09-06 20:44:12 -0400 (Sat, 06 Sep 2003) | 7 lines

Major package reorganization:
- Move code to src/.
- Move docs to doc/:
  + texi doc to doc/texinfo/
  + original manual pages to doc/man/
  + translated manual pages to doc/man/xx/
------------------------------------------------------------------------

$ git log --stat -1 298b975264724b5adb72667f59a2f18cc14ff08f
commit 298b975264724b5adb72667f59a2f18cc14ff08f
Author: Jordi Mallach <address@hidden>
Date:   Sun Sep 7 00:44:12 2003 +0000

    Major package reorganization:
    - Move code to src/.
    - Move docs to doc/:
      + texi doc to doc/texinfo/
      + original manual pages to doc/man/
      + translated manual pages to doc/man/xx/
    
    
    git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/address@hidden 
35c25a1d-7b9e-4130-9fde-d3aeb78583b8

 .cvsignore                         |   3 -
 ChangeLog                          |   3 +
 Makefile.am                        |  29 +---
 TODO                               |   1 +
 configure.ac                       |  15 +-
 doc/.cvsignore                     |   2 +
 doc/Makefile.am                    |   3 +
 faq.html => doc/faq.html           |   0
 doc/man/.cvsignore                 |   2 +
 doc/man/Makefile.am                |   5 +
 doc/man/fr/.cvsignore              |   2 +
 doc/man/fr/Makefile.am             |   5 +
 doc/man/fr/nano.1                  | 229 ++++++++++++++++++++++++++++
 doc/man/fr/nanorc.5                | 198 +++++++++++++++++++++++++
 nano.1 => doc/man/nano.1           |   0
 nanorc.5 => doc/man/nanorc.5       |   0
 nanorc.sample => doc/nanorc.sample |   0
 doc/texinfo/.cvsignore             |   4 +
 doc/texinfo/Makefile.am            |   5 +
 nano.texi => doc/texinfo/nano.texi |   0
 nano.1.html                        | 297 -------------------------------------
 nanorc.5.html                      | 196 ------------------------
 src/.cvsignore                     |   4 +
 src/Makefile.am                    |  22 +++
 color.c => src/color.c             |   0
 cut.c => src/cut.c                 |   0
 files.c => src/files.c             |   0
 global.c => src/global.c           |   0
 move.c => src/move.c               |   0
 nano.c => src/nano.c               |   0
 nano.h => src/nano.h               |   0
 proto.h => src/proto.h             |   0
 rcfile.c => src/rcfile.c           |   0
 search.c => src/search.c           |   0
 utils.c => src/utils.c             |   0
 winio.c => src/winio.c             |   0
 36 files changed, 500 insertions(+), 525 deletions(-)

so git was able to track the history across the winio.c->src/winio.c
transition while svn choked and stopped.
-mike

signature.asc
Description: Digital signature