(
Jump to the original submission)
Tue 12 Apr 2011 01:22:39 AM UTC, comment #10:
Yes, I merged them:
http://hg.savannah.gnu.org/hgweb/octave/rev/cf9cae7fed6d
|
Mon 11 Apr 2011 11:54:45 PM UTC, comment #9:
Did the changeset get merged into the default branch?
|
Mon 11 Apr 2011 11:52:12 PM UTC, comment #8:
Patch was applied in this changeset (c3d4542a4f06). Closing bug report.
|
Sun 10 Apr 2011 04:17:29 PM UTC, comment #7:
I think it best if you do it.
I played with local branches in the past, but only managed to screw things up. No doubt I can become comfortable with it, but would be bad form to practice here.
|
Sun 10 Apr 2011 04:11:37 PM UTC, comment #6:
It should be merged, not applied twice.
Working on the default branch, you should be able to do
then you will have some conflicts to resolve, then you can commit the merge.
If you would prefer, I can do it.
|
Sun 10 Apr 2011 03:59:57 PM UTC, comment #5:
John,
I've pushed the change to the stable branch.
http://hg.savannah.gnu.org/hgweb/octave/rev/c3d4542a4f06
Shall I do the same for the default? ... or should it just be merged? I so what is the proper mercurial command for that?
|
Sat 09 Apr 2011 03:10:45 AM UTC, comment #4:
The release-3-4-x branch is closed.
To switch to stable, use
then apply the patch and commit it as usual. You can switch back to default using
As Rik said, it's probably best to maintain to separate local copies, one for default and one for stable, to avoid extra compilation time just because you switched between branches.
I guess we'll need to add some info about this to the HACKING file.
|
Sat 09 Apr 2011 02:49:56 AM UTC, comment #3:
The patch works for me.
By stable branch, do you mean release-3-4-x as well as default ?
What's the proper way to do that? (Till now, I've only pushed to default)
|
Fri 08 Apr 2011 08:03:01 PM UTC, comment #2:
This bug should probably be fixed on the stable branch.
|
Fri 08 Apr 2011 08:02:01 PM UTC, comment #1:
Does the attached patch fix the problem for you? Does it introduce any new problems?
If this works, feel free to add a ChangeLog entry and commit it.
(file #23149)
|
Fri 08 Apr 2011 12:17:31 PM UTC, original submission:
The last result should be [1;1]
|
(Note: upload size limit is set to 16384 kB, after insertion of the required
escape characters.)
Attach File(s):
Comment:
Depends on the following items: None found
Items that depend on this one: None found
Follow 3 latest changes.