Thomas, please help us comparative git ignoramuses, and detail the sequence of commands you would use with git-svn to apply a PR, starting from your fork/clone setup.
On Tue, Feb 18, 2014 at 7:31 AM, Thomas Matthijs <[email protected]> wrote: > Github pull requests can be treated as individual cherry picked patch sets > really, not branch merges ? (ie rebased) from there on out you're in svn > land. No need to "merge". > > But indeed, it tries to detect it based on the file content, and doesn't > work 100% as manual svn moves. > > > On Tue, Feb 18, 2014 at 1:27 PM, Benson Margulies <[email protected]> > wrote: >> >> Well, git-svn has a heap of warnings against using it for merges; it's >> also a really bad idea when renaming a whole package, as it does it >> one-file-at-a-time. >> >> If you have a workflow that works with the ASF mirror and svn, please >> write it up on the Wiki! >> >> >> On Tue, Feb 18, 2014 at 7:23 AM, Thomas Matthijs <[email protected]> wrote: >> > >> > On Tue, Feb 18, 2014 at 1:18 PM, Shai Erera <[email protected]> wrote: >> >> >> >> >> >> Second, has anyone perhaps found a way to overcome that issue? I >> >> thought >> >> about maybe writing a script to detect that, looking at the patch file, >> >> but >> >> it seems hard to detect that the deleted Foo is the new Bar. If it's >> >> just >> >> rename, maybe, but if part of the rename the code changed a lot ... it >> >> becomes harder. >> > >> > >> > Probably not the answer you want but >> > If you use the git-svn bridge it should detect the rename and commit it >> > in >> > svn as a move/copy >> > >> > https://www.kernel.org/pub/software/scm/git/docs/git-svn.html >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> For additional commands, e-mail: [email protected] >> > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
