Junio C Hamano wrote:
> Ok, please don't forget to add necessary .gitignore rule for the new
> stamp file.
I noticed/remembered that, but I forgot to mention I squashed that in,
too :)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.ker
Eric Wong writes:
> Junio C Hamano wrote:
>> Eric Wong writes:
>> > The redundant dependencies are biting us :< I agree there presence in
>> > the top-level Makefile needs to be reviewed.
>>
>> Do you feel confident enough that we can leave that question hanging
>> around and still merge this
Eric Wong writes:
> Eric Wong wrote:
>> So I'll hold off until we can fix the build regressions (working on it
>> now)
>
> OK, all fixed, all I needed was this (squashed in):
>
> --- a/perl/Makefile
> +++ b/perl/Makefile
> @@ -22,6 +22,8 @@ clean:
> $(RM) $(makfile).old
> $(RM) PM.st
Junio C Hamano wrote:
> Eric Wong writes:
> > The redundant dependencies are biting us :< I agree there presence in
> > the top-level Makefile needs to be reviewed.
>
> Do you feel confident enough that we can leave that question hanging
> around and still merge this before 1.7.12 safely?
Yes.
Eric Wong writes:
> OK, all fixed, all I needed was this (squashed in):
>
> --- a/perl/Makefile
> +++ b/perl/Makefile
> @@ -22,6 +22,8 @@ clean:
> $(RM) $(makfile).old
> $(RM) PM.stamp
>
> +$(makfile): PM.stamp
> +
> ifdef NO_PERL_MAKEMAKER
> instdir_SQ = $(subst ','\'',$(prefix)/
Eric Wong wrote:
> Junio C Hamano wrote:
> > Eric Wong writes:
> >
> > > I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
> >
> > OK, it seems that you haven't pushed out the result yet (which is
> > fine); how do we want to proceed?
> So I'll hold off until we can fix th
Junio C Hamano wrote:
> Eric Wong writes:
>
> > I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
>
> OK, it seems that you haven't pushed out the result yet (which is
> fine); how do we want to proceed?
Oops, got sidetracked into something else. Before I got sidetracked,
Eric Wong writes:
> I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
OK, it seems that you haven't pushed out the result yet (which is
fine); how do we want to proceed?
I generally prefer pulling from maintainer trees directly to my
'master' without staging them in 'next',
Michael G Schwern writes:
> On 2012.7.27 1:07 PM, Eric Wong wrote:
>> While Makefile.PL now finds .pm files on its own, it does not
>> detect new files after it generates perl/perl.mak.
>
> Are you saying this doesn't work?
>
> perl Makefile.PL
> make -f perl.mak
> touch Git/Foo.pm
> perl Makefil
Michael G Schwern wrote:
> On 2012.7.27 1:07 PM, Eric Wong wrote:
> > While Makefile.PL now finds .pm files on its own, it does not
> > detect new files after it generates perl/perl.mak.
>
> Are you saying this doesn't work?
>
> perl Makefile.PL
> make -f perl.mak
> touch Git/Foo.pm
> perl Makef
On 2012.7.27 1:07 PM, Eric Wong wrote:
> While Makefile.PL now finds .pm files on its own, it does not
> detect new files after it generates perl/perl.mak.
Are you saying this doesn't work?
perl Makefile.PL
make -f perl.mak
touch Git/Foo.pm
perl Makefile.PL
make -f perl.mak
or this?
perl Makefi
Junio C Hamano wrote:
> What was happening was that originally, pu had ms/makefile-pl but
> not ms/git-svn-pm. Hence, perl/Git/SVN.pm did not exist. I ran
> "make" and it created perl/perl.mak that does not know about
> Git/SVN.pm;
>
> Then ms/git-svn-pm is merged to pu and now we have perl/Git
Junio C Hamano wrote:
> The result will be queued tentatively near the tip of 'pu', but as
> this is primarily about git-svn, I would prefer a copy that is
> vetted by Eric to be fed from him.
OK. I've signed-off on the 7 patches you have in pu. Will look at the
other series in a few hours.
Th
On 2012.7.26 10:18 PM, Junio C Hamano wrote:
> If you swap the order of steps 3/4 and 4/4 by creating Git/SVN.pm
> that only has these variable definitions (i.e. "our $X" and "use
> vars $X") and make git-svn.perl use them from Git::SVN in the first
> step, and then do the bulk-moving (equivalent o
Junio C Hamano writes:
> Junio C Hamano writes:
>
>> t91XX series seem to fail in 'pu' with "Can't locate Git/SVN.pm in
>> @INC" for me. I see perl/blib/lib/Git/SVN/ directory and files
>> under it, but there is no perl/blib/lib/Git/SVN.pm installed. I see
>> Git/I18N.pm and Git/SVN/Ra.pm (and
Junio C Hamano writes:
> t91XX series seem to fail in 'pu' with "Can't locate Git/SVN.pm in
> @INC" for me. I see perl/blib/lib/Git/SVN/ directory and files
> under it, but there is no perl/blib/lib/Git/SVN.pm installed. I see
> Git/I18N.pm and Git/SVN/Ra.pm (and friends) mentioned in
> perl/pe
Jonathan Nieder writes:
>> In short:
>>
>> - I didn't see anything questionable in 1/4;
>>
>> - Calling up ::opt_prefix() from module in 2/4 looked ugly to me
>>but I suspect it should be easy to fix;
>>
>> - 3/4 was a straight move and I didn't see anything questionable in
>>it, but I
Junio C Hamano wrote:
> "Michael G. Schwern" writes:
>> Also it can compile on its own now, yay!
>
> Hmmm.
I agree with Michael's "yay" and also think it's fine that after
patch 3 it isn't there yet.
That's because git-svn.perl doesn't use Git::SVN on its own but helps
it out a little. So even
"Michael G. Schwern" writes:
> From: "Michael G. Schwern"
>
> Also it can compile on its own now, yay!
Hmmm.
If you swap the order of steps 3/4 and 4/4 by creating Git/SVN.pm
that only has these variable definitions (i.e. "our $X" and "use
vars $X") and make git-svn.perl use them from Git::SVN
From: "Michael G. Schwern"
Also it can compile on its own now, yay!
---
git-svn.perl | 4
perl/Git/SVN.pm | 9 +++--
t/Git-SVN/00compile.t | 3 ++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 4c77f69..ef10f6f 100755
---
From: "Michael G. Schwern"
Also it can compile on its own now, yay!
---
git-svn.perl | 4
perl/Git/SVN.pm | 9 +++--
t/Git-SVN/00compile.t | 3 ++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 4c77f69..ef10f6f 100755
---
21 matches
Mail list logo
