[Lazarus] Creating patches

[Mattias Gaertner]

On Sat, 9 Jul 2011 12:15:28 +0200
Graeme Geldenhuys <graemeg.lists at gmail.com> wrote:

> On 8 July 2011 23:42, Hans-Peter Diettrich <DrDiettrich1 at aol.com> wrote:
> >
> > First problem is SVN, which does not allow for "incremental" patches, i.e. a
> > big patch cannot be split into smaller steps, as frequently requested by the
> > developers. Solutions?
> 
> Use Git instead of SVN.
> 
> 
> > Next problem are patches created by Git, which seem to be undecipherable by
> > TortoiseSVN "Apply patch..." on Windows. Which tools can be used, on which
> 
> I have no problem doing this. I commit often to a SubVersion
> repository from Git (or via git generated patches).
> 
> Using git to manage a SubVersion repository:
> 
> Step   Command
> ------------------------------------------------------------------
> 1  git checkout -b wip
> 2  [edit your code and make various commits locally]
> 3  git checkout master
> 4  git svn rebase              <-- gets latest changes from SubVersion
> repository
> 5  git rebase wip             <-- blend your local commits from WIP
> branch into main branch
> 6  git svn dcommit         <-- commit all new commits to the
> SubVersion repository
> 7  git checkout wip
> 8  git rebase master        <--- get your WIP branch back on track
> with the latest SubVersion
>                                                  commits.
> 
> Step 5 can be changed to merge all local commits into one large
> commit, or deleting some unnecessary commits etc.   A nice time to
> clean up the history a bit - if needed.

Any volunteer to create a git plugin for Lazarus?


Mattias