You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by Regina Henschel <rb...@t-online.de> on 2012/05/19 16:39:31 UTC
Need guide for my first 'push'
Hi all,
I'm ready to push my first patch. But it is the first time and I need a
guide how to do it.
I have cloned from trunk by 'git svn clone ...'
I have made all the changes, compiled and tested.
I have done 'git commit -am' and controlled the changes with 'git
format-patch git-svn'.
But now I do not know how to continue.
Kind regards
Regina
RE: Need guide for my first 'push'
Posted by "Dennis E. Hamilton" <de...@acm.org>.
Interesting. Thanks for the information.
So git-svn provides some sort of bridge to the SVN side?
Thanks for keeping your opinions about SVN to yourself [;<).
- Dennis
(Who is learning to love having 4 version-control systems installed on his computers. Only two of them by choice, though.)
-----Original Message-----
From: Ariel Constenla-Haile [mailto:arielch@apache.org]
Sent: Saturday, May 19, 2012 12:07
To: ooo-dev@incubator.apache.org
Subject: Re: Need guide for my first 'push'
Hi Dennis,
On Sat, May 19, 2012 at 11:24:22AM -0700, Dennis E. Hamilton wrote:
> I see that you submitted the patch.
>
> There is no way to do commits to Apache OpenOffice via GIT.
sorry but that's not true: I've been working with git-svn since the
first day I had commit rights in the Apache SVN repo, all my commits
have been done with git-svn because I don't use Subversion at all.
Regards
--
Ariel Constenla-Haile
La Plata, Argentina
Re: Need guide for my first 'push'
Posted by Pedro Giffuni <pf...@apache.org>.
--- Sab 19/5/12, Ariel Constenla-Haile <ar...@apache.org> ha scritto:
...
> Hi Dennis,
>
> On Sat, May 19, 2012 at 11:24:22AM -0700, Dennis E. Hamilton
> wrote:
> > I see that you submitted the patch.
> >
> > There is no way to do commits to Apache OpenOffice via
> > GIT.
>
> sorry but that's not true: I've been working with git-svn
> since the first day I had commit rights in the Apache SVN
> repo, all my commits have been done with git-svn because
> I don't use Subversion at all.
>
And I am aware that Juergen and Andre and surely others
have been using git-svn too. Unfortunately git-svn does
cause trouble: sometimes it doesn't add files or delete
directories. I have no objection to people using git-svn
as long as they get used to cleaning the mess ;).
I *love* SVN: it's really simple and practical. The big
thing to watch is that you are using the latest client
(1.7).
Pedro.
Re: Need guide for my first 'push'
Posted by Ariel Constenla-Haile <ar...@apache.org>.
Hi Dennis,
On Sat, May 19, 2012 at 11:24:22AM -0700, Dennis E. Hamilton wrote:
> I see that you submitted the patch.
>
> There is no way to do commits to Apache OpenOffice via GIT.
sorry but that's not true: I've been working with git-svn since the
first day I had commit rights in the Apache SVN repo, all my commits
have been done with git-svn because I don't use Subversion at all.
Regards
--
Ariel Constenla-Haile
La Plata, Argentina
RE: Need guide for my first 'push'
Posted by "Dennis E. Hamilton" <de...@acm.org>.
I see that you submitted the patch.
There is no way to do commits to Apache OpenOffice via GIT.
I had not encountered that problem with Tortoise SVN on my Windows XP machine. Most of my working copies are in shared folders on a home server, and not even that is a problem.
There have been serious performance improvements. You might try it again. You can run the command-line SVN, of course.
- Dennis
-----Original Message-----
From: Regina Henschel [mailto:rb.henschel@t-online.de]
Sent: Saturday, May 19, 2012 11:07
To: ooo-dev@incubator.apache.org
Subject: Re: Need guide for my first 'push'
Hi Dennis,
Dennis E. Hamilton schrieb:
> OK, I see. Ariel's advice is appropriate if you are comfortable with
> GIT and like the compactness. However, it is only good for
> non-committer activities, such as seeing if you can build from
> source, etc.
>
> (By the way, with the latest SVN and especially with TortoiseSVN, I
> don't know that there is much difference in the size for working
> copies, and you can be very selective with what you check out and
> keep updated.)
I had bad experience with TortoiseSVN. It puts itself in a way into the
Windows explorer, that the explorer becomes so slow, that it was
unusable. Therefore I uninstalled TortoiseSVN. For making patches that
other push, I did not need it.
>
> However, GIT is not supported for what committers do on Apache
> OpenOffice. No pushing changes. The GIT view of the Apache
> OpenOffice SVN repository is read-only.
Command 'git svn dcommit' should push the changes. But I don't know
whether the commit message will be transfered too or if I need something
in addition. And I'm afraid of disturbing something, otherwise I would
simple try it. Perhaps I wait, whether Ariel has an answer, for he guide
me to git-svn.
Making the patch available for review before pushing is a good idea. I
have attached it to https://issues.apache.org/ooo/show_bug.cgi?id=3582
Kind regards
Regina
Re: Need guide for my first 'push'
Posted by Ariel Constenla-Haile <ar...@apache.org>.
Hi Regina,
On Sat, May 19, 2012 at 08:07:21PM +0200, Regina Henschel wrote:
> Hi Dennis,
>
> Dennis E. Hamilton schrieb:
> >OK, I see. Ariel's advice is appropriate if you are comfortable with
> >GIT and like the compactness. However, it is only good for
> >non-committer activities, such as seeing if you can build from
> >source, etc.
> >
> >(By the way, with the latest SVN and especially with TortoiseSVN, I
> >don't know that there is much difference in the size for working
> >copies, and you can be very selective with what you check out and
> >keep updated.)
>
> I had bad experience with TortoiseSVN. It puts itself in a way into
> the Windows explorer, that the explorer becomes so slow, that it was
> unusable. Therefore I uninstalled TortoiseSVN. For making patches
> that other push, I did not need it.
In general, Subversion sucks (I don't say it loud, as it is an Apache
project ;) ).
> >
> >However, GIT is not supported for what committers do on Apache
> >OpenOffice. No pushing changes. The GIT view of the Apache
> >OpenOffice SVN repository is read-only.
>
> Command 'git svn dcommit' should push the changes. But I don't know
> whether the commit message will be transfered
Yes, it will be transfered.
> too or if I need something in addition. And I'm afraid of disturbing
> something, otherwise I would simple try it.
Before really committing the changes to the SVN repo, you can always
test what will be committed:
git svn dcommit --dry-run
Then commit:
git svn dcommit
As long as you didn't yet run "git svn dcommit" you can do everything
you can do with git (combine commits, change commit message, etc.), you
have all the power of working with git :)
Regards
--
Ariel Constenla-Haile
La Plata, Argentina
Re: Need guide for my first 'push'
Posted by Regina Henschel <rb...@t-online.de>.
Hi Dennis,
Dennis E. Hamilton schrieb:
> OK, I see. Ariel's advice is appropriate if you are comfortable with
> GIT and like the compactness. However, it is only good for
> non-committer activities, such as seeing if you can build from
> source, etc.
>
> (By the way, with the latest SVN and especially with TortoiseSVN, I
> don't know that there is much difference in the size for working
> copies, and you can be very selective with what you check out and
> keep updated.)
I had bad experience with TortoiseSVN. It puts itself in a way into the
Windows explorer, that the explorer becomes so slow, that it was
unusable. Therefore I uninstalled TortoiseSVN. For making patches that
other push, I did not need it.
>
> However, GIT is not supported for what committers do on Apache
> OpenOffice. No pushing changes. The GIT view of the Apache
> OpenOffice SVN repository is read-only.
Command 'git svn dcommit' should push the changes. But I don't know
whether the commit message will be transfered too or if I need something
in addition. And I'm afraid of disturbing something, otherwise I would
simple try it. Perhaps I wait, whether Ariel has an answer, for he guide
me to git-svn.
Making the patch available for review before pushing is a good idea. I
have attached it to https://issues.apache.org/ooo/show_bug.cgi?id=3582
Kind regards
Regina
RE: Need guide for my first 'push'
Posted by "Dennis E. Hamilton" <de...@acm.org>.
OK, I see. Ariel's advice is appropriate if you are comfortable with GIT and like the compactness. However, it is only good for non-committer activities, such as seeing if you can build from source, etc.
(By the way, with the latest SVN and especially with TortoiseSVN, I don't know that there is much difference in the size for working copies, and you can be very selective with what you check out and keep updated.)
However, GIT is not supported for what committers do on Apache OpenOffice. No pushing changes. The GIT view of the Apache OpenOffice SVN repository is read-only.
I've only made free-standing patch files using clones of Mercurial (for LibreOffice, just once). I am not certain how you do it with GIT. I think you make your modification, commit it to the GIT clone, and then use the ability to produce a diff (.patch) between the latest and the previous version of the particular files.
RECOMMENDATION (LONGER TERM)
Using the https://svn.apache.org/repos/asf/incubator/ooo location, check out what you want using SVN. I would create a directory for that level but you might want to do only check out trunk in a directory underneath it. Later, you can check out ooosite underneath incubator/ooo/ and work on the web site that way too, if you wish.
In your working copy, make the changes that you propose.
Then, still in the working copy, use the procedure for deriving a patch instead of committing your changed working-copy. That will give you a patch file good for review-then-commit rather than commit-then-review. You can attach the patch to a bugzilla and post a [PATCH] note to ooo-dev to request review.
CTR works pretty well to the trunk, though. If it doesn't look right, someone will usually fix it or revert it very quickly. Since there are notices to the commit list, you need not worry about your change being overlooked.
I prefer RTC myself, especially where I am not that familiar with how everything holds together. The procedure for deriving patch files for changes made in your working copy is straightforward.
- Dennis
PS: The first time you do a direct check-in I think you'll be asked to provide your committer credentials. I let TortoiseSVN handle all of that for me on Windows.
-----Original Message-----
From: Regina Henschel [mailto:rb.henschel@t-online.de]
Sent: Saturday, May 19, 2012 09:26
To: ooo-dev@incubator.apache.org
Subject: Re: Need guide for my first 'push'
Hi Dennis,
Dennis E. Hamilton schrieb:
> Regina, where did you see anything about using GIT with AOO?
http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/201110.mbox/%3C20111014233653.GA694%40localhost%3E
Kind regards
Regina
Re: Need guide for my first 'push'
Posted by Regina Henschel <rb...@t-online.de>.
Hi Dennis,
Dennis E. Hamilton schrieb:
> Regina, where did you see anything about using GIT with AOO?
http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/201110.mbox/%3C20111014233653.GA694%40localhost%3E
Kind regards
Regina
RE: Need guide for my first 'push'
Posted by "Dennis E. Hamilton" <de...@acm.org>.
Regina, where did you see anything about using GIT with AOO? That needs to be fixed.
For committers, it is necessary to use SVN.
There is no git-based submission on the Apache OpenOffice project.
The git view of the SVN is a courtesy, it is not how development is done.
You can derive a patch *file* with git (though it is tricky to find how to do it, as I recall) and submit it to AOO as an attachment to a bugzilla or in a post to ooo-dev (I think in-line text then). All of those things can be done as well with the SVN (and it is easier to derive a patch file), but you can also do commits in the SVN if you have committer authorization. Committers: Remember to use the https: URL when checking-out a Working Copy in order to be able to make commits.
Contributors who do not have commit rights can also use the SVN and derive patches in their working copy.
Committers who would rather submit a patch for review than make a commit directly can use the same procedure with their SVN Working Copy.
- Dennis
PS: For those who have not dug into the AOO SVN Structure already, it may be interesting to learn that the www.opeenoffice.org web site is maintained in SVN and published via SVN also.
-----Original Message-----
From: Regina Henschel [mailto:rb.henschel@t-online.de]
Sent: Saturday, May 19, 2012 07:40
To: Apache OpenOffice dev
Subject: Need guide for my first 'push'
Hi all,
I'm ready to push my first patch. But it is the first time and I need a
guide how to do it.
I have cloned from trunk by 'git svn clone ...'
I have made all the changes, compiled and tested.
I have done 'git commit -am' and controlled the changes with 'git
format-patch git-svn'.
But now I do not know how to continue.
Kind regards
Regina
Re: Need guide for my first 'push'
Posted by Armin Le Grand <Ar...@me.com>.
Regina Henschel <rb...@t-online.de> wrote:
> Hi Ariel,
>
> Ariel Constenla-Haile schrieb:
>> On Sat, May 19, 2012 at 03:43:49PM -0300, Ariel Constenla-Haile wrote:
>>> Hi Regina,
>>>
>>> On Sat, May 19, 2012 at 04:39:31PM +0200, Regina Henschel wrote:
>>>> Hi all,
>>>>
>>>> I'm ready to push my first patch. But it is the first time and I
>>>> need a guide how to do it.
>>>>
>>>> I have cloned from trunk by 'git svn clone ...'
>>>> I have made all the changes, compiled and tested.
>>>> I have done 'git commit -am' and controlled the changes with 'git
>>>> format-patch git-svn'.
>>>>
>>>> But now I do not know how to continue.
>>>
>>> First, make sure you have committed everything:
>>>
>>> git status
>>>
>>> Then check out the last changes, so that your tree is up to date:
>>>
>>> git svn rebase
>>>
>>> If there was a merge, make sure your changes are still working.
>>> Once ready to push your changes to the Apache SVN repo, simply do:
>>>
>>> * check what will be committed:
>>>
>>> git svn dcommit --dry run
>>
>> typo: --dry-run
>>
>>> * commit it:
>>>
>>> git svn dcommit
>>>
>>>
>>> More info:
>>>
>>> - git help svn
>>> - http://trac.parrot.org/parrot/wiki/git-svn-tutorial
>>> - http://blog.tsunanet.net/2007/07/learning-git-svn-in-5min.html
>>> - http://www.reasonablyopinionated.com/2009/06/git-svn-workflow.html
>>> - ...
>
>
> DOne, but it seems to fail. I get
> $ git svn dcommit
> Committing to https://svn-master.apache.org/repos/asf/incubator/ooo/trunk ...
> Authentication realm: <https://svn-master.apache.org:443> ASF Committers
> Password for 'pppregin':
> Authentication realm: <https://svn-master.apache.org:443> ASF Committers
> Username: regina
> Password for 'regina':
> M main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
> No such file or directory: Can't create temporary file from template
> '/cygdrive/c/AOO_2012_05_g
> it/trunk/C:/cygwin/tmp/svn-XXXXXX': No such file or directory at
> /usr/lib/git-core/git-svn line
> 579
>
> What is wrong?
I made the following experience: After using 'source winenv.set.sh' on win
there is the variable TMPDIR which still uses a DOSstyle path. I usually
chnage it to 'TMPDIR=/cygdrive/a/TEMP' (choose your own path of course) to
fix that.
HTH!
> Kind regards
> Regina
--
ALG
Re: Need guide for my first 'push'
Posted by Regina Henschel <rb...@t-online.de>.
Hi Ariel,
I have pushed it :)
I thought that the reason for a wrong tmp might be, that I had sourced
winenv.set.sh for the build. I have restarted Cygwin to set back the
environment variables. I don't know whether this was the reason, but
commiting has worked then.
Hopefully all is OK now.
Kind regards
Regina
Ariel Constenla-Haile schrieb:
> Hi Regina,
>
> On Sat, May 19, 2012 at 09:38:35PM +0200, Regina Henschel wrote:
>> DOne, but it seems to fail. I get
>> $ git svn dcommit
>> Committing to
>> https://svn-master.apache.org/repos/asf/incubator/ooo/trunk ...
>> Authentication realm:<https://svn-master.apache.org:443> ASF Committers
>> Password for 'pppregin':
>> Authentication realm:<https://svn-master.apache.org:443> ASF Committers
>> Username: regina
>> Password for 'regina':
>> M main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
>> No such file or directory: Can't create temporary file from template
>> '/cygdrive/c/AOO_2012_05_git/trunk/C:/cygwin/tmp/svn-XXXXXX':
>> No such file or directory at /usr/lib/git-core/git-svn line
>> 579
>>
>> What is wrong?
>
> This looks like a bug in git-svn Win-port:
>
> '/cygdrive/c/AOO_2012_05_git/trunk/C:/cygwin/tmp/svn-XXXXXX'
>
> it looks like it is messing with the $TEMP directory.
> A fast and dirty workaround would be to create that folder:
>
> cd /cygdrive/c/AOO_2012_05_git/trunk/
> mkdir 'C:'
>
>
> Then git status will show you this 'C:' folder as untracked, a horrible
> hack, but I will have to google if there is another solution.
Re: Need guide for my first 'push'
Posted by Ariel Constenla-Haile <ar...@apache.org>.
Hi Regina,
On Sat, May 19, 2012 at 09:38:35PM +0200, Regina Henschel wrote:
> DOne, but it seems to fail. I get
> $ git svn dcommit
> Committing to
> https://svn-master.apache.org/repos/asf/incubator/ooo/trunk ...
> Authentication realm: <https://svn-master.apache.org:443> ASF Committers
> Password for 'pppregin':
> Authentication realm: <https://svn-master.apache.org:443> ASF Committers
> Username: regina
> Password for 'regina':
> M main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
> No such file or directory: Can't create temporary file from template
> '/cygdrive/c/AOO_2012_05_git/trunk/C:/cygwin/tmp/svn-XXXXXX':
> No such file or directory at /usr/lib/git-core/git-svn line
> 579
>
> What is wrong?
This looks like a bug in git-svn Win-port:
'/cygdrive/c/AOO_2012_05_git/trunk/C:/cygwin/tmp/svn-XXXXXX'
it looks like it is messing with the $TEMP directory.
A fast and dirty workaround would be to create that folder:
cd /cygdrive/c/AOO_2012_05_git/trunk/
mkdir 'C:'
Then git status will show you this 'C:' folder as untracked, a horrible
hack, but I will have to google if there is another solution.
Regards
--
Ariel Constenla-Haile
La Plata, Argentina
Re: Need guide for my first 'push'
Posted by Regina Henschel <rb...@t-online.de>.
Hi Ariel,
Ariel Constenla-Haile schrieb:
> On Sat, May 19, 2012 at 03:43:49PM -0300, Ariel Constenla-Haile wrote:
>> Hi Regina,
>>
>> On Sat, May 19, 2012 at 04:39:31PM +0200, Regina Henschel wrote:
>>> Hi all,
>>>
>>> I'm ready to push my first patch. But it is the first time and I
>>> need a guide how to do it.
>>>
>>> I have cloned from trunk by 'git svn clone ...'
>>> I have made all the changes, compiled and tested.
>>> I have done 'git commit -am' and controlled the changes with 'git
>>> format-patch git-svn'.
>>>
>>> But now I do not know how to continue.
>>
>> First, make sure you have committed everything:
>>
>> git status
>>
>> Then check out the last changes, so that your tree is up to date:
>>
>> git svn rebase
>>
>> If there was a merge, make sure your changes are still working.
>> Once ready to push your changes to the Apache SVN repo, simply do:
>>
>> * check what will be committed:
>>
>> git svn dcommit --dry run
>
> typo: --dry-run
>
>> * commit it:
>>
>> git svn dcommit
>>
>>
>> More info:
>>
>> - git help svn
>> - http://trac.parrot.org/parrot/wiki/git-svn-tutorial
>> - http://blog.tsunanet.net/2007/07/learning-git-svn-in-5min.html
>> - http://www.reasonablyopinionated.com/2009/06/git-svn-workflow.html
>> - ...
DOne, but it seems to fail. I get
$ git svn dcommit
Committing to
https://svn-master.apache.org/repos/asf/incubator/ooo/trunk ...
Authentication realm: <https://svn-master.apache.org:443> ASF Committers
Password for 'pppregin':
Authentication realm: <https://svn-master.apache.org:443> ASF Committers
Username: regina
Password for 'regina':
M
main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
No such file or directory: Can't create temporary file from template
'/cygdrive/c/AOO_2012_05_g
it/trunk/C:/cygwin/tmp/svn-XXXXXX': No such file or directory at
/usr/lib/git-core/git-svn line
579
What is wrong?
Kind regards
Regina
Re: Need guide for my first 'push'
Posted by Ariel Constenla-Haile <ar...@apache.org>.
On Sat, May 19, 2012 at 03:43:49PM -0300, Ariel Constenla-Haile wrote:
> Hi Regina,
>
> On Sat, May 19, 2012 at 04:39:31PM +0200, Regina Henschel wrote:
> > Hi all,
> >
> > I'm ready to push my first patch. But it is the first time and I
> > need a guide how to do it.
> >
> > I have cloned from trunk by 'git svn clone ...'
> > I have made all the changes, compiled and tested.
> > I have done 'git commit -am' and controlled the changes with 'git
> > format-patch git-svn'.
> >
> > But now I do not know how to continue.
>
> First, make sure you have committed everything:
>
> git status
>
> Then check out the last changes, so that your tree is up to date:
>
> git svn rebase
>
> If there was a merge, make sure your changes are still working.
> Once ready to push your changes to the Apache SVN repo, simply do:
>
> * check what will be committed:
>
> git svn dcommit --dry run
typo: --dry-run
> * commit it:
>
> git svn dcommit
>
>
> More info:
>
> - git help svn
> - http://trac.parrot.org/parrot/wiki/git-svn-tutorial
> - http://blog.tsunanet.net/2007/07/learning-git-svn-in-5min.html
> - http://www.reasonablyopinionated.com/2009/06/git-svn-workflow.html
> - ...
>
>
> Regards
> --
> Ariel Constenla-Haile
> La Plata, Argentina
--
Ariel Constenla-Haile
La Plata, Argentina
Re: Need guide for my first 'push'
Posted by Ariel Constenla-Haile <ar...@apache.org>.
Hi Regina,
On Sat, May 19, 2012 at 04:39:31PM +0200, Regina Henschel wrote:
> Hi all,
>
> I'm ready to push my first patch. But it is the first time and I
> need a guide how to do it.
>
> I have cloned from trunk by 'git svn clone ...'
> I have made all the changes, compiled and tested.
> I have done 'git commit -am' and controlled the changes with 'git
> format-patch git-svn'.
>
> But now I do not know how to continue.
First, make sure you have committed everything:
git status
Then check out the last changes, so that your tree is up to date:
git svn rebase
If there was a merge, make sure your changes are still working.
Once ready to push your changes to the Apache SVN repo, simply do:
* check what will be committed:
git svn dcommit --dry run
* commit it:
git svn dcommit
More info:
- git help svn
- http://trac.parrot.org/parrot/wiki/git-svn-tutorial
- http://blog.tsunanet.net/2007/07/learning-git-svn-in-5min.html
- http://www.reasonablyopinionated.com/2009/06/git-svn-workflow.html
- ...
Regards
--
Ariel Constenla-Haile
La Plata, Argentina