You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by Christian Grobmeier <gr...@gmail.com> on 2012/06/02 12:42:35 UTC

Using Git to consume stuff for Logging (how to)

I managed to use git-svn to push a svn commit :-)

here is how I did it:
http://wiki.apache.org/logging/UsingGitWithLogging

My plan is to use a branch to consume Antonios and Antonys work to
avoid to big damages in case something wents wrong.

The branch is:
http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/

I welcome all improvements to my wikipage above.

Cheers
Christian

On Sat, Jun 2, 2012 at 11:44 AM,  <gr...@apache.org> wrote:
> Author: grobmeier
> Date: Sat Jun  2 09:44:56 2012
> New Revision: 1345471
>
> URL: http://svn.apache.org/viewvc?rev=1345471&view=rev
> Log:
> test commit
>
> Added:
>    logging/log4j/branches/log4j12modules/test.txt   (with props)
>
> Added: logging/log4j/branches/log4j12modules/test.txt
> URL: http://svn.apache.org/viewvc/logging/log4j/branches/log4j12modules/test.txt?rev=1345471&view=auto
> ==============================================================================
> --- logging/log4j/branches/log4j12modules/test.txt (added)
> +++ logging/log4j/branches/log4j12modules/test.txt Sat Jun  2 09:44:56 2012
> @@ -0,0 +1 @@
> +test
>
> Propchange: logging/log4j/branches/log4j12modules/test.txt
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
>


-- 
http://www.grobmeier.de
https://www.timeandbill.de

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Re: Using Git to consume stuff for Logging (how to)

Posted by Christian Grobmeier <gr...@gmail.com>.
And now it is done!
Here is the branch with your synced changes:
http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12-bz53299/

Did not try out anything, just consumed and pushed. Will come back to
it tomorrow or somewhere next week.

Cheers
Christian

On Sat, Jun 2, 2012 at 1:46 PM, Antonio Petrelli
<an...@gmail.com> wrote:
> 2012/6/2 Christian Grobmeier <gr...@gmail.com>:
>> On Sat, Jun 2, 2012 at 1:36 PM, Antonio Petrelli
>> <an...@gmail.com> wrote:
>>> 2012/6/2 Christian Grobmeier <gr...@gmail.com>:
>>>> I managed to use git-svn to push a svn commit :-)
>>>>
>>>> here is how I did it:
>>>> http://wiki.apache.org/logging/UsingGitWithLogging
>>>>
>>>> My plan is to use a branch to consume Antonios and Antonys work to
>>>> avoid to big damages in case something wents wrong.
>>>>
>>>> The branch is:
>>>> http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/
>>>>
>>>> I welcome all improvements to my wikipage above.
>>>
>>> Just in time!
>>> I merged changes made by Anthony with recent changes in official Log4j trunk:
>>> https://github.com/apetrelli/log4j
>>> I think it can be the starting point.
>>> Currently the build fails tests, lf5 does not build and there are some
>>> strange things (javadoc at compile time... doh). So take it "cum grano
>>> salis".
>>
>> Cool!
>>
>> I am just doing a merge commit from Antony to a branch.
>> Its for testing and looks good so far (still checking).
>> http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/
>
> The major headache was in the parent pom. There are some missing files
> in Anthony's fork and some files need to be moved from the root to the
> core module (Java source files, tests and test resources).
> IOW, I suggest to use my fork :-)
>
> Antonio
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
> For additional commands, e-mail: log4j-dev-help@logging.apache.org
>



-- 
http://www.grobmeier.de
https://www.timeandbill.de

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Re: Using Git to consume stuff for Logging (how to)

Posted by Christian Grobmeier <gr...@gmail.com>.
On Sat, Jun 2, 2012 at 1:46 PM, Antonio Petrelli
<an...@gmail.com> wrote:
> 2012/6/2 Christian Grobmeier <gr...@gmail.com>:
>> On Sat, Jun 2, 2012 at 1:36 PM, Antonio Petrelli
>> <an...@gmail.com> wrote:
>>> 2012/6/2 Christian Grobmeier <gr...@gmail.com>:
>>>> I managed to use git-svn to push a svn commit :-)
>>>>
>>>> here is how I did it:
>>>> http://wiki.apache.org/logging/UsingGitWithLogging
>>>>
>>>> My plan is to use a branch to consume Antonios and Antonys work to
>>>> avoid to big damages in case something wents wrong.
>>>>
>>>> The branch is:
>>>> http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/
>>>>
>>>> I welcome all improvements to my wikipage above.
>>>
>>> Just in time!
>>> I merged changes made by Anthony with recent changes in official Log4j trunk:
>>> https://github.com/apetrelli/log4j
>>> I think it can be the starting point.
>>> Currently the build fails tests, lf5 does not build and there are some
>>> strange things (javadoc at compile time... doh). So take it "cum grano
>>> salis".
>>
>> Cool!
>>
>> I am just doing a merge commit from Antony to a branch.
>> Its for testing and looks good so far (still checking).
>> http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/
>
> The major headache was in the parent pom. There are some missing files
> in Anthony's fork and some files need to be moved from the root to the
> core module (Java source files, tests and test resources).
> IOW, I suggest to use my fork :-)

Great you have fixed that already!
I will recreate the branch and start all over.
Meanwhile I know how to do this :-)

Thanks to github, Anthony can just fork your work then and easily jump
into the effords again :-)

> Antonio
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
> For additional commands, e-mail: log4j-dev-help@logging.apache.org
>



-- 
http://www.grobmeier.de
https://www.timeandbill.de

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Re: Using Git to consume stuff for Logging (how to)

Posted by Antonio Petrelli <an...@gmail.com>.
2012/6/2 Christian Grobmeier <gr...@gmail.com>:
> On Sat, Jun 2, 2012 at 1:36 PM, Antonio Petrelli
> <an...@gmail.com> wrote:
>> 2012/6/2 Christian Grobmeier <gr...@gmail.com>:
>>> I managed to use git-svn to push a svn commit :-)
>>>
>>> here is how I did it:
>>> http://wiki.apache.org/logging/UsingGitWithLogging
>>>
>>> My plan is to use a branch to consume Antonios and Antonys work to
>>> avoid to big damages in case something wents wrong.
>>>
>>> The branch is:
>>> http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/
>>>
>>> I welcome all improvements to my wikipage above.
>>
>> Just in time!
>> I merged changes made by Anthony with recent changes in official Log4j trunk:
>> https://github.com/apetrelli/log4j
>> I think it can be the starting point.
>> Currently the build fails tests, lf5 does not build and there are some
>> strange things (javadoc at compile time... doh). So take it "cum grano
>> salis".
>
> Cool!
>
> I am just doing a merge commit from Antony to a branch.
> Its for testing and looks good so far (still checking).
> http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/

The major headache was in the parent pom. There are some missing files
in Anthony's fork and some files need to be moved from the root to the
core module (Java source files, tests and test resources).
IOW, I suggest to use my fork :-)

Antonio

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Re: Using Git to consume stuff for Logging (how to)

Posted by Christian Grobmeier <gr...@gmail.com>.
On Sat, Jun 2, 2012 at 1:36 PM, Antonio Petrelli
<an...@gmail.com> wrote:
> 2012/6/2 Christian Grobmeier <gr...@gmail.com>:
>> I managed to use git-svn to push a svn commit :-)
>>
>> here is how I did it:
>> http://wiki.apache.org/logging/UsingGitWithLogging
>>
>> My plan is to use a branch to consume Antonios and Antonys work to
>> avoid to big damages in case something wents wrong.
>>
>> The branch is:
>> http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/
>>
>> I welcome all improvements to my wikipage above.
>
> Just in time!
> I merged changes made by Anthony with recent changes in official Log4j trunk:
> https://github.com/apetrelli/log4j
> I think it can be the starting point.
> Currently the build fails tests, lf5 does not build and there are some
> strange things (javadoc at compile time... doh). So take it "cum grano
> salis".

Cool!

I am just doing a merge commit from Antony to a branch.
Its for testing and looks good so far (still checking).
http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/

How does it differ from your version? Should i better start again with
your fork or is it enough to merge yourb work?

Sorry for asking i am fresh with git.

> Antonio
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
> For additional commands, e-mail: log4j-dev-help@logging.apache.org
>



-- 
http://www.grobmeier.de
https://www.timeandbill.de

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Re: Using Git to consume stuff for Logging (how to)

Posted by Christian Grobmeier <gr...@gmail.com>.
On Sat, Jun 2, 2012 at 1:38 PM, Antonio Petrelli
<an...@gmail.com> wrote:
> 2012/6/2 Antonio Petrelli <an...@gmail.com>:
>> Currently the build fails tests, lf5 does not build and there are some
>> strange things (javadoc at compile time... doh). So take it "cum grano
>> salis".
>
> Oh and nt module build is skipped.

 No problem i just committed stuff which does not run the tests - i
guess it is ok to have problems in a branch :-)


> Antonio
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
> For additional commands, e-mail: log4j-dev-help@logging.apache.org
>



-- 
http://www.grobmeier.de
https://www.timeandbill.de

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Re: Using Git to consume stuff for Logging (how to)

Posted by Antonio Petrelli <an...@gmail.com>.
2012/6/2 Antonio Petrelli <an...@gmail.com>:
> Currently the build fails tests, lf5 does not build and there are some
> strange things (javadoc at compile time... doh). So take it "cum grano
> salis".

Oh and nt module build is skipped.

Antonio

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Re: Using Git to consume stuff for Logging (how to)

Posted by Antonio Petrelli <an...@gmail.com>.
2012/6/2 Christian Grobmeier <gr...@gmail.com>:
> I managed to use git-svn to push a svn commit :-)
>
> here is how I did it:
> http://wiki.apache.org/logging/UsingGitWithLogging
>
> My plan is to use a branch to consume Antonios and Antonys work to
> avoid to big damages in case something wents wrong.
>
> The branch is:
> http://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules/
>
> I welcome all improvements to my wikipage above.

Just in time!
I merged changes made by Anthony with recent changes in official Log4j trunk:
https://github.com/apetrelli/log4j
I think it can be the starting point.
Currently the build fails tests, lf5 does not build and there are some
strange things (javadoc at compile time... doh). So take it "cum grano
salis".

Antonio

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org