How to fix a bug for 0.48.1
Hi all,
I just fixed a bug in trunk that should be released also in 0.48.1.
How should one go about this? Is there a better way of simply doing the edits twice, once in trunk and once in 0.48.1 branch? (i.e. should i merge things or...)
Thanks, Johan
J.B.C.Engelen,
Hello how are you great I hope. OK for this you have to do some items and it is very short list. First please answer a few question? Do you have a developers status on Sourceforge Project Inkscape (not required) OK If you do great, but I would say if you want to have it looked over. Please make an account on launchpad.net and it will be a branch on bzr to make a branch of your own. Link: https://code.edge.launchpad.net/inkscape once on there you can pull a branch and create the changes then create a pushed branch under yourself so it can be reviewed by developers. EG: (example only) Pull branch. bzr branch lp:inkscape/0.48.x make changes all of them it also allows to pull from parent again etc. bzr push lp:~user/inkscape/changename <-- change name like Gobjfiles or what makes you happy to give a clue of what it is? Someone can review go to irc.freenode.net #inkscape ask for help if needed.
Regards, Leo Albert Jackson Jr
--- On Sun, 8/29/10, J.B.C.Engelen@...1578... <J.B.C.Engelen@...1578...> wrote:
From: J.B.C.Engelen@...1578... <J.B.C.Engelen@...1578...> Subject: [Inkscape-devel] How to fix a bug for 0.48.1 To: inkscape-devel@lists.sourceforge.net Date: Sunday, August 29, 2010, 12:40 PM Hi all,
I just fixed a bug in trunk that should be released also in 0.48.1.
How should one go about this? Is there a better way of simply doing the edits twice, once in trunk and once in 0.48.1 branch? (i.e. should i merge things or...)
Thanks, Johan
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program Be part of this innovative community and reach millions of netbook users worldwide. Take advantage of special opportunities to increase revenue and speed time-to-market. Join now, and jumpstart your future. http://p.sf.net/sfu/intel-atom-d2d _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
Hi Leo,
I know how to commit code to Inkscape, and have done so in the past.
What I was asking is whether there is a way to apply a certain patch to two branches (trunk and 0.48.x) at the same time.
Ciao, Johan
-----Original Message----- From: Leo Jackson [mailto:lajjr@...36...] Sent: Sunday, August 29, 2010 19:33 To: Engelen, J.B.C. (Johan) Cc: Inkscape-devel@lists.sourceforge.net Subject: Re: [Inkscape-devel] How to fix a bug for 0.48.1
J.B.C.Engelen,
Hello how are you great I hope. OK for this you have to do some items and it is very short list. First please answer a few question? Do you have a developers status on Sourceforge Project Inkscape (not required) OK If you do great, but I would say if you want to have it looked over. Please make an account on launchpad.net and it will be a branch on bzr to make a branch of your own. Link: https://code.edge.launchpad.net/inkscape once on there you can pull a branch and create the changes then create a pushed branch under yourself so it can be reviewed by developers. EG: (example only) Pull branch. bzr branch lp:inkscape/0.48.x make changes all of them it also allows to pull from parent again etc. bzr push lp:~user/inkscape/changename <-- change name like Gobjfiles or what makes you happy to give a clue of what it is? Someone can review go to irc.freenode.net #inkscape ask for help if needed.
Regards, Leo Albert Jackson Jr
--- On Sun, 8/29/10, J.B.C.Engelen@...1578... <J.B.C.Engelen@...1578...> wrote:
From: J.B.C.Engelen@...1578... <J.B.C.Engelen@...1578...> Subject: [Inkscape-devel] How to fix a bug for 0.48.1 To: inkscape-devel@lists.sourceforge.net Date: Sunday, August 29, 2010, 12:40 PM Hi all,
I just fixed a bug in trunk that should be released also in 0.48.1.
How should one go about this? Is there a better way of simply doing the edits twice, once in trunk and once in 0.48.1 branch? (i.e. should i merge things or...)
Thanks, Johan
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program Be part of this innovative community and reach millions of netbook users worldwide. Take advantage of special opportunities to increase revenue and speed time-to-market. Join now, and jumpstart your future. http://p.sf.net/sfu/intel-atom-d2d _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program Be part of this innovative community and reach millions of netbook users worldwide. Take advantage of special opportunities to increase revenue and speed time-to-market. Join now, and jumpstart your future. http://p.sf.net/sfu/intel-atom-d2d _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
J.B.C.Engelen,
Well then as you know that 48.1 or 48.X is just that version 48.X and trunk is the new proposed version 49 seeing this you will have to have two separate branches. It you commit the branch or get branch 48.1 and change and push to both you might end up reverting files to a previous version by complete accident. The developer branch is trunk so new features, new advancements, new fixes. So you may just have to apply them to both separately.
I may be wrong best practices it keep them separate being that new is usually unstable or (developer branch)
Regards, Leo Albert Jackson Jr
--- On Mon, 8/30/10, J.B.C.Engelen@...1578... <J.B.C.Engelen@...1578...> wrote:
From: J.B.C.Engelen@...1578... <J.B.C.Engelen@...1578...> Subject: RE: [Inkscape-devel] How to fix a bug for 0.48.1 To: lajjr@...36... Cc: Inkscape-devel@lists.sourceforge.net Date: Monday, August 30, 2010, 11:17 AM Hi Leo,
I know how to commit code to Inkscape, and have done so in the past.
What I was asking is whether there is a way to apply a certain patch to two branches (trunk and 0.48.x) at the same time.
Ciao, Johan
-----Original Message----- From: Leo Jackson [mailto:lajjr@...36...] Sent: Sunday, August 29, 2010 19:33 To: Engelen, J.B.C. (Johan) Cc: Inkscape-devel@lists.sourceforge.net Subject: Re: [Inkscape-devel] How to fix a bug for
0.48.1
J.B.C.Engelen,
Hello how are you great I hope. OK for this you have
to do
some items and it is very short list. First please answer a few question? Do you have a developers status on Sourceforge Project
Inkscape (not required) OK If you do great, but I would say if you want to
have it
looked over. Please make an account on launchpad.net and it will be
a branch on bzr
to make a branch of your own. Link: https://code.edge.launchpad.net/inkscape once on there you can pull a branch and create the
changes
then create a pushed branch under yourself so it can be reviewed by
developers.
EG: (example only) Pull branch. bzr branch lp:inkscape/0.48.x make changes all of them it also allows to pull from
parent again etc.
bzr push lp:~user/inkscape/changename <--
change name like
Gobjfiles or what makes you happy to give a clue of what it is? Someone can review go to irc.freenode.net #inkscape
ask for
help if needed.
Regards, Leo Albert Jackson Jr
--- On Sun, 8/29/10, J.B.C.Engelen@...1578...
<J.B.C.Engelen@...1578...>
wrote:
From: J.B.C.Engelen@...1578...
<J.B.C.Engelen@...1578...>
Subject: [Inkscape-devel] How to fix a bug for
0.48.1
To: inkscape-devel@lists.sourceforge.net Date: Sunday, August 29, 2010, 12:40 PM Hi all,
I just fixed a bug in trunk that should be
released also in
0.48.1.
How should one go about this? Is there a better
way of
simply doing the edits twice, once in trunk and once in 0.48.1
branch?
(i.e. should i merge things or...)
Thanks, Johan
Sell apps to millions through the Intel(R)
Atom(Tm)
Developer Program Be part of this innovative community and reach
millions of
netbook users worldwide. Take advantage of special
opportunities to
increase revenue and speed time-to-market. Join now, and jumpstart
your future.
http://p.sf.net/sfu/intel-atom-d2d _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
Sell apps to millions through the Intel(R) Atom(Tm)
Developer Program
Be part of this innovative community and reach
millions of
netbook users worldwide. Take advantage of special opportunities to
increase revenue and speed time-to-market. Join now, and jumpstart your
future.
http://p.sf.net/sfu/intel-atom-d2d _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
2010/8/30 <J.B.C.Engelen@...1578...>:
Hi Leo, I know how to commit code to Inkscape, and have done so in the past. What I was asking is whether there is a way to apply a certain patch to two branches (trunk and 0.48.x) at the same time.
Check out lp:inkscape/0.48.x and apply it there. If you don't have the permission to do this, create a diff that applies cleanly against the 0.48 branch and post it to the list. After that, one of the admins should review and apply it.
Regards, Krzysztof
-----Original Message----- From: Krzysztof Kosiński [mailto:tweenk.pl@...400...] Sent: 01 September 2010 19:10 To: Engelen, J.B.C. (Johan) Cc: lajjr@...36...; Inkscape-devel@lists.sourceforge.net Subject: Re: [Inkscape-devel] How to fix a bug for 0.48.1
2010/8/30 <J.B.C.Engelen@...1578...>:
Hi Leo, I know how to commit code to Inkscape, and have done so in the past. What I was asking is whether there is a way to apply a certain patch
to two branches (trunk and 0.48.x) at the same time.
Check out lp:inkscape/0.48.x and apply it there. If you don't have the permission to do this, create a diff that applies cleanly against the 0.48 branch and post it to the list. After that, one of the admins should review and apply it.
I was hoping the 'all-awesome' bzr would make life easier.
Ciao, Johan
On Wed, 2010-09-01 at 22:26 +0200, J.B.C.Engelen@...1578... wrote:
-----Original Message----- From: Krzysztof Kosiński [mailto:tweenk.pl@...400...] Sent: 01 September 2010 19:10 To: Engelen, J.B.C. (Johan) Cc: lajjr@...36...; Inkscape-devel@lists.sourceforge.net Subject: Re: [Inkscape-devel] How to fix a bug for 0.48.1
2010/8/30 <J.B.C.Engelen@...1578...>:
Hi Leo, I know how to commit code to Inkscape, and have done so in the past. What I was asking is whether there is a way to apply a certain patch
to two branches (trunk and 0.48.x) at the same time.
Check out lp:inkscape/0.48.x and apply it there. If you don't have the permission to do this, create a diff that applies cleanly against the 0.48 branch and post it to the list. After that, one of the admins should review and apply it.
I was hoping the 'all-awesome' bzr would make life easier.
I think Krzysztof's diff/patch suggestion will still make it a little nicer for you than having a checkout of that branch if you're not interested in having one. :)
Cheers, Josh
-----Original Message----- From: Krzysztof Kosiński [mailto:tweenk.pl@...400...] Sent: woensdag 1 september 2010 22:56 To: Engelen, J.B.C. (Johan) Cc: Inkscape-devel@lists.sourceforge.net Subject: Re: [Inkscape-devel] How to fix a bug for 0.48.1
2010/9/1 <J.B.C.Engelen@...1578...>:
I was hoping the 'all-awesome' bzr would make life easier.
Ciao, Johan
To merge revision 1234 from trunk into 0.48 branch, say this in 0.48.x branch's directory: bzr merge -r 1233..1234 ../trunk
That's what I was looking for, thanks! Added it to the wiki page on bazaar.
Ciao, Johan
participants (4)
-
unknown＠example.com -
Joshua A. Andler -
Krzysztof Kosiński -
Leo Jackson