[umbrello-devel] Does 4.14 contain all the code it should?

[Albert Astals Cid]

El Dissabte, 19 de juliol de 2014, a les 11:36:51, Ralf Habacker va escriure:
> Am 17.07.2014 01:00, schrieb Albert Astals Cid:
> > Hi guys, i tried merging 4.13 into 4.14 to make sure that all the code
> > that
> > was in 4.13 is in 4.14 but i got a huge conflict (i guess you don't like
> > merging (you should makes things like this very easy)) so i can't be sure
> > 4.14 contains everything that was in 4.13 too.
> 
> Usually I personally develop and fix issues in master branch and
> backport the related commits to stable branches with 'git cherry-pick
> -x' like shown in
> https://projects.kde.org/projects/kde/kdesdk/umbrello/repository/revisions/6
> 5d3e16809d780f06d7a2a0feb0dd2be9246c0f8
> 
> 4 days ago I tried the way you mentioned: I fixed an issue in kde 4.13
> https://projects.kde.org/projects/kde/kdesdk/umbrello/repository/revisions/7
> f661fed65d5948e4de14981858241f63ea8e8de and tried to merge it into 4.14 and
> master and got the same bad
> experience :-(
> 
> The question is why is merging old umbrello branches so much work ? Is
> there any better way ?

You're not the first to ask this, i just wrote http://tsdgeos.blogspot.com/2014/07/my-way-to-develop-with-git-in-kde-repos.html

Tell me if it convinces you about the benefits

> 
> > Can anyone confirm that 4.14 indeed contains everything it should?
> 
> Any official way to verify this ?

Well, you guys know the code, you should be able to read the code and see if everything is in or not :D

> 
> Today I did run the following
> git checkout -f KDE/4.14
> git rebase origin/KDE/4.13
> # skip all conflicted commits
> git pull --rebase
> 
> At the end I got two additional commits: One of them
> 45d7fb6301b2f6f4b2cc595dbd85e8b6f415d43b I have to revert because it was
> outdated and lead to compile failures.

Ok, so what i did to try to make sure all from 4.13 was in 4.14 and then got me doubting was this

# Checkout 4.14
git checkout KDE/4.14 
# Make sure i have what is in the repos
git fetch
git reset --hard origin/KDE/4.14 
# Merge the repo 4.13 branch -> Get a lot of conflicts
git merge origin/KDE/4.13
# diff against the repo 4.14 branch
git diff origin/KDE/4.14 > Q

I'm attaching the Q file so you can have a look at it and see if you think all is fine or something should be brought over to 4.14 (and then merged to master).

Cheers,
  Albert


> 
> Regards
>  Ralf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Q
Type: text/x-patch
Size: 40216 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/umbrello-devel/attachments/20140720/b2afc001/attachment-0001.diff>