similar to: [LLVMdev] Git-Svn commit?

On Mon, Dec 31, 2012 at 4:56 PM, Renato Golin <rengolin at systemcall.org> wrote: > With git, I normally issue a pull request, but in LLVM, this won't > work. Is there a FAQ/doc/manual on how to do that or what are the best > practices when working with git? Basically, once you are set up with git-svn (see

On 1 January 2013 00:52, Sean Silva <silvas at purdue.edu> wrote: > Basically, once you are set up with git-svn (see > <http://llvm.org/docs/GettingStarted.html#for-developers-to-work-with-git-svn>), > all you have to do is `git svn dcommit`. Oh, the docs do mention "dcommit" en passant, but nothing explicit. > 1. checkout master and pull from origin. > 2.

Hi Sean, Don't worry, I'm not in a hurry right now and I think this thread does solve the problem (haven't tested yet). I think I'll change the current page slightly just to make it more clear... thanks, --renato On 5 January 2013 04:19, Sean Silva <silvas at purdue.edu> wrote: > Sorry for the massive delay on this... did this thread at least fix > your immediate

On 1 January 2013 02:03, Sean Silva <silvas at purdue.edu> wrote: > I'm not sure if this was clear from my description, but it will still > commit each commit in `origin/master..HEAD` individually. Not explicitly, but I assumed so. Good thing git has a powerful squash/merge/reword interface. This is probably another topic that it's worth mention in the docs explicitly. --

Sorry for the massive delay on this... did this thread at least fix your immediate problem? It may be a while until I can get to writing a "workflows" page. -- Sean Silva On Mon, Dec 31, 2012 at 9:07 PM, Renato Golin <rengolin at systemcall.org> wrote: > On 1 January 2013 02:03, Sean Silva <silvas at purdue.edu> wrote: >> I'm not sure if this was clear from my

On 1 January 2013 01:16, Sean Silva <silvas at purdue.edu> wrote: > I believe that what git-svn does is commit everything in your branch > that isn't in mainline (i.e. `origin/master..HEAD`). I don't think it > really pays any attention to branches (besides moving them after > committing). As if it was an SVN tree, makes sense. > Ok. I'll try to get to that

On Sat, Jan 5, 2013 at 5:24 AM, Renato Golin <rengolin at systemcall.org> wrote: > I think I'll change the current page slightly just to make it more clear... Ok, please do. -- Sean Silva

On 13 September 2011 15:50, Matthieu Moy <Matthieu.Moy at grenoble-inp.fr> wrote: > I guess you have to rebase (pull --rebase or so) your branches. "git > rebase" is relatively smart, and will skip patches that you already have > in your local branch. http://llvm.org/docs/GettingStarted.html#git_mirror "Since the upstream repository is in Subversion, you should use

Erik> I am surprised noone has mentioned the one of the biggest Erik> advantages of Git which is proper author attribution for Erik> non-core and drive-by patch contributors. >From what I can make of the git-svn docs, that LLVM committers should be adding a "From: <email>" field to commit messages instead of "Patch by <name>". If the original author is

Tobias Grosser <tobias at grosser.es> writes: >> Will git-cherrypick work or is the merging process going to confuse >> git-svn? > > To use git-svn you should always have a history without any git > merges. Just commit after commit after commit. I do not know what kind > of history git-cherrypick produces. To clarify, I just need to create the branch at the point

Rafael Ávila de Espíndola <rafael.espindola at gmail.com> writes: > On 07/05/2011 03:27 PM, David Greene wrote: >> My git-svn fu is not very strong. >> >> In the course of preparing a set of AVX patches, I've committed several >> changes to my local LLVM git clone. I don't want to send all of those >> changes upstream right away. What's the

My git-svn fu is not very strong. In the course of preparing a set of AVX patches, I've committed several changes to my local LLVM git clone. I don't want to send all of those changes upstream right away. What's the best way to send just the first of those changes us using git-svn? dcommit appears to send all pending changes. Is there a way of branching/cherry-picking that will

On 07/06/2011 07:53 AM, David A. Greene wrote: > Tobias Grosser<tobias at grosser.es> writes: > >>> Will git-cherrypick work or is the merging process going to confuse >>> git-svn? >> >> To use git-svn you should always have a history without any git >> merges. Just commit after commit after commit. I do not know what kind >> of history

Dave, bty, don't you work on your branches, but master? I think it would be not "the right git way". ...Takumi ps. for me, to commit much commits; $ git checkout master $ git rebase -i mybranch (pick up commits interactive on master as cherry) $ make -C builddir check-all -j4 $ git svn dcommit -n

Jason Kim <jasonwkim at google.com> writes: > On Wed, Jul 27, 2011 at 8:59 PM, Mark Lacey <641 at rudkx.com> wrote: > > Besides, the git-svn readonly bridge is a great solution for those who want to use git > >   It seems to be a reasonable solution for those individuals who > want to use git, but in my experience not for organizations that >

On Mon, Dec 31, 2012 at 6:09 PM, Renato Golin <rengolin at systemcall.org> wrote: >> 1. checkout master and pull from origin. >> 2. rebase stuff to be committed onto master. > > Can you commit directly from branches? Or do you have to merge to > master to commit? I believe that what git-svn does is commit everything in your branch that isn't in mainline (i.e.

On 07/05/2011 03:48 PM, David A. Greene wrote: > Rafael Ávila de Espíndola<rafael.espindola at gmail.com> writes: > >> On 07/05/2011 03:27 PM, David Greene wrote: >>> My git-svn fu is not very strong. >>> >>> In the course of preparing a set of AVX patches, I've committed several >>> changes to my local LLVM git clone. I don't want to

On 07/05/2011 03:27 PM, David Greene wrote: > My git-svn fu is not very strong. > > In the course of preparing a set of AVX patches, I've committed several > changes to my local LLVM git clone. I don't want to send all of those > changes upstream right away. What's the best way to send just the first > of those changes us using git-svn? dcommit appears to send all

On Mon, Dec 31, 2012 at 6:20 PM, Renato Golin <rengolin at systemcall.org> wrote: >> I believe that what git-svn does is commit everything in your branch >> that isn't in mainline (i.e. `origin/master..HEAD`). I don't think it >> really pays any attention to branches (besides moving them after >> committing). > > As if it was an SVN tree, makes sense.

Good morning, Dave. On Thu, Feb 24, 2011 at 4:17 AM, David A. Greene <greened at obbligato.org> wrote: > Do git repositories cloned from git-svn mirrors work properly?  For > example: > >                         svn >                          ^ >                          | >                          | >                          V >                       git-svn