[Octave-bug-tracker] [bug #39010] strsplit returns incorrect result if target string contains only delimiters

[Ben Abbott]

Follow-up Comment #1, bug #39010 (project octave):

I had decided that the proper thing to do was to back out the changes to
strsplit and start over by renaming the original and then introducing a new
function.

I did the following.


hg update -C default
hg backout -r 61989cde13ae -m "Backout 61989cde13ae" --merge
hg commit -m "Merge the backout of 61989cde13ae"
hg backout -r 5be43435bd5b -m "Backout 5be43435bd5b" --merge
hg commit -m "Merge the backout of 5be43435bd5b"
hg backout -r 1de4ec2a856d -m "Backout 1de4ec2a856d" --merge
hg commit -m "Merge the backout of 1de4ec2a856d"


During which I had some merge problems.  I think I've got it worked out, but
am in unfamiliar territory, so I'm a bit nervous. 

I check the number of "heads"


$ hg heads
changeset:   16678:88fffa5261c9
tag:         tip
parent:      16676:1237c65c0b1f
parent:      16677:0f46a5397b72
user:        Ben Abbott  <address@hidden>
date:        Fri May 17 19:28:54 2013 +0800
summary:     Merge the backout of 1de4ec2a856d

changeset:   16645:450c03932d6c
branch:      classdef
user:        John W. Eaton <address@hidden>
date:        Sun May 12 21:47:57 2013 -0400
summary:     don't push superclass and metaclass tokens twice

changeset:   16600:f2f5dd09e97d
branch:      stable
user:        Jordi Gutiérrez Hermoso <address@hidden>
date:        Wed May 01 14:41:50 2013 -0400
summary:     doc: fix some minor sparse documentation oversights


And the outgoing says,


$ hg outgoing
comparing with /Users/bpabbott/Development/mercurial/octave
searching for changes
changeset:   16673:c9eebb0281c8
parent:      16412:61989cde13ae
user:        Ben Abbott  <address@hidden>
date:        Fri May 17 18:57:28 2013 +0800
summary:     Backout 61989cde13ae

changeset:   16674:e7687c90c1d8
parent:      16672:fd43631f09c2
parent:      16673:c9eebb0281c8
user:        Ben Abbott  <address@hidden>
date:        Fri May 17 18:57:35 2013 +0800
summary:     Merge the backout of 61989cde13ae

changeset:   16675:3ab2e6b4dc6b
parent:      16411:5be43435bd5b
user:        Ben Abbott  <address@hidden>
date:        Fri May 17 18:57:44 2013 +0800
summary:     Backout 5be43435bd5b

changeset:   16676:1237c65c0b1f
parent:      16674:e7687c90c1d8
parent:      16675:3ab2e6b4dc6b
user:        Ben Abbott  <address@hidden>
date:        Fri May 17 19:27:47 2013 +0800
summary:     Merge the backout of 5be43435bd5b

changeset:   16677:0f46a5397b72
parent:      16403:1de4ec2a856d
user:        Ben Abbott  <address@hidden>
date:        Fri May 17 19:28:04 2013 +0800
summary:     Backout 1de4ec2a856d

changeset:   16678:88fffa5261c9
tag:         tip
parent:      16676:1237c65c0b1f
parent:      16677:0f46a5397b72
user:        Ben Abbott  <address@hidden>
date:        Fri May 17 19:28:54 2013 +0800
summary:     Merge the backout of 1de4ec2a856d


If all looks good, I can push this change.


    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/bugs/?39010>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/