git conversion discrepency

[Nicholas Clark <nick@ccl4.org>]

So, while I was doing other things, I decided to try to get the computer to
check git vs perforce.

I hope I'm doing this right. For revision 84, I did this:

$ git log --all --grep='p4raw-id: //depot/perl@84$' | grep commit | sed -e s/commit//
 9ffc99022937d12d82971398812e9d6375112739
$ git checkout 9ffc99022937d12d82971398812e9d6375112739
HEAD is now at 9ffc990... Merge maint-5.004 branch (5.004_01) with mainline.

and this for perforce:

$ p4 sync ...@84
...@84 - file(s) up-to-date.


and there is a mile of diffs:

Only in /home/nclark/Perl/perl: .git
Only in /home/nclark/p4perl/perl/: README.threads
diff -pru /home/nclark/Perl/perl/XSUB.h /home/nclark/p4perl/perl/XSUB.h
--- /home/nclark/Perl/perl/XSUB.h       2008-10-06 11:00:38.000000000 +0100
+++ /home/nclark/p4perl/perl/XSUB.h     1997-09-29 17:43:50.000000000 +0100
@@ -7,7 +7,7 @@
 #endif
 
 #define dXSARGS                                \
-       dSP; dMARK;                     \
+       dTHR; dSP; dMARK;               \
        I32 ax = mark - stack_base + 1; \
        I32 items = sp - mark
 
diff -pru /home/nclark/Perl/perl/av.c /home/nclark/p4perl/perl/av.c
--- /home/nclark/Perl/perl/av.c 2008-10-06 11:00:38.000000000 +0100
+++ /home/nclark/p4perl/perl/av.c       1997-09-29 17:43:50.000000000 +0100
@@ -30,8 +30,10 @@ AV* av;
     while (key) {
        sv = AvARRAY(av)[--key];
        assert(sv);
-       if (sv != &sv_undef)
+       if (sv != &sv_undef) {
+           dTHR;
            (void)SvREFCNT_inc(sv);
+       }
     }
     key = AvARRAY(av) - AvALLOC(av);
     while (key)

...


Alternatively:

$ diff -pru ~/Perl/perl ~/p4perl/perl/ | diffstat
 Perl/perl/.git                     |only
 p4perl/perl//README.threads        |only
 p4perl/perl//thread.h              |only
 p4perl/perl/XSUB.h                 |    2 
 p4perl/perl/av.c                   |  281 +++++++++++++
 p4perl/perl/cop.h                  |   16 
 p4perl/perl/cv.h                   |   32 +
 p4perl/perl/deb.c                  |   23 +
 p4perl/perl/doop.c                 |   17 
 p4perl/perl/dump.c                 |  156 +++----
 p4perl/perl/ext/DB_File/DB_File.pm |   10 
 p4perl/perl/ext/DB_File/DB_File.xs |    8 
 p4perl/perl/ext/Opcode/Makefile.PL |    2 
 p4perl/perl/ext/Opcode/Opcode.pm   |    8 
 p4perl/perl/ext/Opcode/Opcode.xs   |    7 
 p4perl/perl/ext/attrs              |only
 p4perl/perl/gv.c                   |   17 
 p4perl/perl/hv.c                   |    4 
 p4perl/perl/interp.sym             |    1 
 p4perl/perl/keywords.h             |  468 +++++++++++-----------
 p4perl/perl/keywords.pl            |    2 
 p4perl/perl/lib/Class/Fields.pm    |only
 p4perl/perl/lib/ISA.pm             |only
 p4perl/perl/malloc.c               |   96 ++--
 p4perl/perl/op.h                   |   14 
 p4perl/perl/opcode.h               |  761 ++++++++++++++++++-------------------
 p4perl/perl/opcode.pl              |    7 
 p4perl/perl/perly.c                |  233 +++++------
 p4perl/perl/perly.y                |    5 
 p4perl/perl/pp.h                   |    7 
 p4perl/perl/run.c                  |   37 -
 p4perl/perl/scope.c                |   53 ++
 p4perl/perl/scope.h                |   14 
 p4perl/perl/sv.h                   |    9 
 p4perl/perl/t/op/do.t              |    2 
 p4perl/perl/toke.c                 |   80 +++
 p4perl/perl/vms/perly_c.vms        |  233 +++++------
 p4perl/perl/vms/vms.c              |    8 
 p4perl/perl/x2p/Makefile.SH        |    3 
 39 files changed, 1575 insertions(+), 1041 deletions(-)


Did I do something wrong?

This is a git clone of git://perl5.git.perl.org/perl

via a tunnel: ssh -L9418:perl5.git.perl.org:9418 

Nicholas Clark

---

Follow-Ups from:

Nicholas Clark <nick@ccl4.org>
"Craig A. Berry" <craig.a.berry@gmail.com>

---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index][Thread Index][Top&Search][Original]

---