[Kdenlive-devel] Git workflow

2011-11-04 Thread Simon A. Eugster
Hey Alberto, hey jb! On 11/03/2011 04:36 PM, jb wrote: > On Thursday 03 November 2011 08:49:22 Alberto Villa wrote: >> Hi all! >> >> To complete svn2git rules I need your opinion on what will be our >> preferred workflow in Git. >> >> First thing first, have a look here: >> http://community.kde.or

[Kdenlive-devel] Git workflow

2011-11-04 Thread Alberto Villa
a I have no doubt that it is a part of the destiny of the human race, in its gradual improvement, to leave off eating animals. -- Thoreau -- next part -- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 314 bytes Desc: This is a digitally signed message part. URL: <http://mail.kde.org/pipermail/kdenlive/attachments/2004/f2a62488/attachment.sig>

[Kdenlive-devel] Git workflow

2011-11-04 Thread Alberto Villa
as scrubbed... Name: signature.asc Type: application/pgp-signature Size: 314 bytes Desc: This is a digitally signed message part. URL: <http://mail.kde.org/pipermail/kdenlive/attachments/2004/083d7aa4/attachment.sig>

[Kdenlive-devel] Git workflow

2011-11-04 Thread Mikko Rapeli
Just my 2?: I've followed mlt and kdenlive from git past few years and developed some fixes in feature branches, and if needed rebased those fixes to newer master branch versions. Branching, merging and rebasing (fast forwarding branches to newer baseline) are so easy in git that they don't need

[Kdenlive-devel] Git workflow

2011-11-04 Thread jb
On Friday 04 November 2011 15:11:40 you wrote: > On Friday 04 November 2011 15:05:18 Alberto Villa wrote: > > Last case I can think of: *.1 revision. You tag 0.x.y from master, and > > then merge feature A to it. But people starts screaming that 0.x.y > > removes root partition. So you checkout tag

[Kdenlive-devel] Git workflow

2011-11-04 Thread Yuri Chornoivan
Fri, 04 Nov 2011 16:55:19 +0200, jb : > 1) What about string freeze? My proposal to wait a few weeks before > merging > new features after a release was to make sure that no new string is > introduced > if we make a .1 release. But then it would block development, so I think > that