[Kde-scm-interest] Fwd: ideas to git conversion

[Thiago Macieira]

On Thursday 04 December 2008 14:46:56 Johannes Sixt wrote:
> Raul Fernandes schrieb:
> > Having the all history is a good idea a priori, but
> > it will consume a lot of space to a totally unnecessary thing.
> > Actually, garbage for the most of people.
> > We are working with Qt4, why do you need the history form Qt 1, 2 and
> > 3 to be immediately available from your copy of kde repository?? If
> > you need it, it always be available from the svn repository (in
> > read-only mode). And there is no many times you will need it.
>
> KDE has a few "live" branches, that is branches where changes are
> committed to: There's trunk, there's 3.5, perhaps 4.0, 4.1, and 4.2
> (ReallySoonNow).

Actually, 4.0 is closed for development and 4.1 will close very soon (when 4.2 
is released). The only chances of those moving again are security fixes.

As for 3.5, at this point in time, it can be considered a completely different 
codebase, so anything there can't be merged into 4.2. So it would be either a 
patch or a manual change.

> That's a policy that I personally absolutely detest. As outlined above,
> fixes should *always* be applied to the oldest live branch where it is
> needed and then be *forward* merged. Not the other way like is customary
> with KDE+SVN: fix on trunk and *back-port*. [I don't want to know how many
> bug fixes are on trunk but never get back-ported due to
> lazyness/forgetfulness/etc].

That's what we're doing in Qt.

~/src/troll/qt-4.4 $ git pull
[...]
Updating 2dc9196..e3a3d4b
Fast forward
[...]
 12 files changed, 55 insertions(+), 22 deletions(-)

~/src/troll/qt-4.5 $ git pull
Updating 77627a9..7988d05                                         
Fast forward                                                      
[...]
 49 files changed, 744 insertions(+), 339 deletions(-)

~/src/troll/qt-4.5 $ git merge qt/4.4
warning: too many files, skipping inexact rename detection
[...]
Automatic merge failed; fix conflicts and then commit the result.

[fix conflict]
~/src/troll/qt-4.5 $ git commit
Created commit da06c20: Merge branch 'qt/4.4' into qt/4.5

~/src/troll/qt-4.5 $ git push
   7988d05..da06c20  qt/4.5 -> qt/4.5

~/src/troll/qt-main $ git pull
[...]
 2667 files changed, 155616 insertions(+), 89537 deletions(-)                    

~/src/troll/qt-main $ git merge qt/4.5
Merge made by recursive.                                   
[...]
 117 files changed, 3498 insertions(+), 3700 deletions(-)

~/src/troll/qt-main $ git push
   87b4c29..f4d6a3a  master -> master

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Software Engineer - Nokia, Qt Software
  Qt Software is hiring - ask me
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20081204/7df4dfcc/attachment-0001.sig