Moving 0.11 to trunk
Locked
 
|
Hi,
No problem, can still be done! _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: Moving 0.11 to trunk
|
|
On Monday 23 March 2009 19:05:23 Marcel Wiesweg wrote: > Hi, > > I feel we are waiting for this to be done. > > There was this huge KUrl toLocalFile() patch. Gilles, has this been ported > to 0.11? If not, I might give it a try with git's cherry-pick. > > Andi, what's your status on your local git trees? Don't wait for me, I will update my branches somehow. I had no time to work on them so I will merge them with the new trunk later on. > > It seems there is no release tag done for 0.10.0 final (or any other > release since 0.10.0-beta2), at least not in tags/digikam, or am I missing > something? No problem, can still be done! Yes we are very inconsistent with the tags :-) But they can be created easily. > > If this done, and we have checked all changes in trunk/ since the point in > time the tarballs were created, are ported to the 0.11 branch, we need to > remove trunk (delete?) and move 0.11 in its place, am I right about this? Yes, we should remove trunk and copy the branch in there. Merging will fail, I tried all kind of merge strategies with GIT (octupus, recursive....) all failed. Since we have backported everything from trunk (I hope so at least), we can just copy the 0.11 branch. This is the easiest solution... does anybody see problems with this strategy? Andi _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
|
|
In reply to this post by Marcel Wiesweg
2009/3/23 Marcel Wiesweg <[hidden email]>:
> Hi, > > I feel we are waiting for this to be done. yes > > There was this huge KUrl toLocalFile() patch. Not huge. just few entries >Gilles, has this been ported > to 0.11? yes, this week end. >If not, I might give it a try with git's cherry-pick. > > Andi, what's your status on your local git trees? > > It seems there is no release tag done for 0.10.0 final (or any other release > since 0.10.0-beta2), at least not in tags/digikam, or am I missing > something? I just have forget to do it. My apologies... > No problem, can still be done! > > If this done, and we have checked all changes in trunk/ since the point in > time the tarballs were created, are ported to the 0.11 branch, we need to > remove trunk (delete?) and move 0.11 in its place, am I right about this? Good question. if you delete trunk entries, do you will lost all files log ? Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
|
|
In reply to this post by Bugzilla from andi.clemens@gmx.net
2009/3/23 Andi Clemens <[hidden email]>:
> > On Monday 23 March 2009 19:05:23 Marcel Wiesweg wrote: >> Hi, >> >> I feel we are waiting for this to be done. >> >> There was this huge KUrl toLocalFile() patch. Gilles, has this been ported >> to 0.11? If not, I might give it a try with git's cherry-pick. >> >> Andi, what's your status on your local git trees? > > Don't wait for me, I will update my branches somehow. I had no time to work on > them so I will merge them with the new trunk later on. > >> >> It seems there is no release tag done for 0.10.0 final (or any other >> release since 0.10.0-beta2), at least not in tags/digikam, or am I missing >> something? No problem, can still be done! > > Yes we are very inconsistent with the tags :-) But they can be created easily. > >> >> If this done, and we have checked all changes in trunk/ since the point in >> time the tarballs were created, are ported to the 0.11 branch, we need to >> remove trunk (delete?) and move 0.11 in its place, am I right about this? > > Yes, we should remove trunk and copy the branch in there. Merging will fail, I > tried all kind of merge strategies with GIT (octupus, recursive....) all > failed. > Since we have backported everything from trunk (I hope so at least), we can > just copy the 0.11 branch. yes, i think to not have forget something... I check everyday all commits... > This is the easiest solution... does anybody see problems with this strategy? For me it's fine if we don't lost svn log (:=))). In theory, 0.11 log = all trunk + last changes Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: Moving 0.11 to trunk
|
|
In reply to this post by Gilles Caulier-4
On Monday 23 March 2009 19:18:15 Gilles Caulier wrote: > 2009/3/23 Marcel Wiesweg <[hidden email]>: > > Hi, > > > > I feel we are waiting for this to be done. > > yes > > > There was this huge KUrl toLocalFile() patch. > > Not huge. just few entries > > >Gilles, has this been ported > > to 0.11? > > yes, this week end. > > >If not, I might give it a try with git's cherry-pick. > > > > Andi, what's your status on your local git trees? > > > > It seems there is no release tag done for 0.10.0 final (or any other > > release since 0.10.0-beta2), at least not in tags/digikam, or am I > > missing something? > > I just have forget to do it. My apologies... > > > No problem, can still be done! > > > > If this done, and we have checked all changes in trunk/ since the point > > in time the tarballs were created, are ported to the 0.11 branch, we need > > to remove trunk (delete?) and move 0.11 in its place, am I right about > > this? > > Good question. if you delete trunk entries, do you will lost all files log Good question :-) Normally I would say no, but I'm not sure right now (you confused me :-)) I will test this with a test SVN repo on my computer... Andi _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
|
|
In reply to this post by Gilles Caulier-4
> > release since 0.10.0-beta2), at least not in tags/digikam, or am I > > missing something? > > I just have forget to do it. My apologies... > > > No problem, can still be done! > > > > If this done, and we have checked all changes in trunk/ since the point > > in time the tarballs were created, are ported to the 0.11 branch, we need > > to remove trunk (delete?) and move 0.11 in its place, am I right about > > this? > > Good question. if you delete trunk entries, do you will lost all files log > ? \_____/ A few commits before point Y we create the 0.10.0 tag from current trunk. Now I just dont know where to move current trunk at point Y apart from deleting it. I hope I'm right with this! _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: Moving 0.11 to trunk
|
|
In reply to this post by Bugzilla from andi.clemens@gmx.net
It seems to work, this is what I did:
svn rm file:///REPO/trunk svn mv file:///REPO/branches/0.11 file:///REPO/trunk All logs are still there... Andi On Monday 23 March 2009 19:24:50 Andi Clemens wrote: > On Monday 23 March 2009 19:18:15 Gilles Caulier wrote: > > 2009/3/23 Marcel Wiesweg <[hidden email]>: > > > Hi, > > > > > > I feel we are waiting for this to be done. > > > > yes > > > > > There was this huge KUrl toLocalFile() patch. > > > > Not huge. just few entries > > > > >Gilles, has this been ported > > > to 0.11? > > > > yes, this week end. > > > > >If not, I might give it a try with git's cherry-pick. > > > > > > Andi, what's your status on your local git trees? > > > > > > It seems there is no release tag done for 0.10.0 final (or any other > > > release since 0.10.0-beta2), at least not in tags/digikam, or am I > > > missing something? > > > > I just have forget to do it. My apologies... > > > > > No problem, can still be done! > > > > > > If this done, and we have checked all changes in trunk/ since the point > > > in time the tarballs were created, are ported to the 0.11 branch, we > > > need to remove trunk (delete?) and move 0.11 in its place, am I right > > > about this? > > > > Good question. if you delete trunk entries, do you will lost all files > > log > > Good question :-) > Normally I would say no, but I'm not sure right now (you confused me :-)) > > I will test this with a test SVN repo on my computer... > > Andi > > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
|
|
In reply to this post by Marcel Wiesweg
Hi,
_______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
|
|
2009/3/26 Marcel Wiesweg <[hidden email]>:
> Hi, > > sorry for delay, I was busy. I am going to do this tonight or tomorrow > morning if noone objects. Fine for me... Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: Moving 0.11 to trunk
|
|
for me too...
On Thursday 26 March 2009 18:14:56 Gilles Caulier wrote: > 2009/3/26 Marcel Wiesweg <[hidden email]>: > > Hi, > > > > sorry for delay, I was busy. I am going to do this tonight or tomorrow > > morning if noone objects. > > Fine for me... > > Gilles > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
|
|
In reply to this post by Marcel Wiesweg
That's because I want to tag it before I svn rm current trunk. Marcel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
|
|
Marcel,
This is the right one : http://websvn.kde.org/?view=rev&revision=940093 Gilles 2009/3/27 Marcel Wiesweg <[hidden email]>: > > > Gilles, do you know from which SVN revision you made the 0.10.0 final > release? > That's because I want to tag it before I svn rm current trunk. > > thanks > Marcel > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
«
Return to digikam-devel
|
1 view|%1 views
| Free forum by Nabble | Edit this page |