I've pushed fixes to both. Thanks! Unrelated, I'm wondering if it would make sense to the order of "Real Name" and "Public Name" in the workbench form? At the moment, they match the order that they appear in the ICLA, and I pre-fill in the first using the name from the email, and then later use the value in the first field to seed the value of the second. In testing, I'm noticing that the name in the email is more likely to match the public name, and the real name typically is longer (for example, with the addition of a middle name).
Thoughts? - Sam Ruby On Wed, Jan 6, 2016 at 8:18 PM, Craig L Russell <[email protected]> wrote: > Probably unrelated, but the same icla created a wrong entry for iclas.txt. > > tl;dr the new tool puts a space in front of the stub name (Signed CLA; > robert-pozarickij instead of the proper Signed CLA;robert-pozarickij) > > Craig > > clr% svn up > Updating '.': > C iclas.txt > Updated to revision 64621. > Conflict discovered in file 'iclas.txt'. > Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, > (mc) my side of conflict, (tc) their side of conflict, > (s) show all options: df > --- iclas.txt.r64621 - THEIRS > +++ iclas.txt - MERGED > @@ -5332,7 +5332,11 @@ > dimpbx:Dimitri Pourbaix:Dimitri Pourbaix:[email protected]:Signed > CLA;dimitri-pourbaix > notinavail:Brad Powell:Brad Powell:[email protected]:Signed > CLA;brad-powell > bpowers:Robert Powers:Bobby Powers:[email protected]:Signed > CLA;robert-powers > +<<<<<<< .mine > +notinavail:Robert Požarickij:Robert > Požarickij:[email protected]:Signed CLA; robert-pozarickij > +======= > notinavail:Robert Požarickij:Robert > Požarickij:[email protected]:Signed CLA;robert-pozarickij > +>>>>>>> .r64621 > paolopoz:Paolo Pozzan:Paolo Pozzan:[email protected]:Signed CLA;paolo-pozzan > arvind:Arvind Prabhakar:Arvind Prabhakar:[email protected]:Signed > CLA;arvind-prabhakar > johnp:John Pradeep:John Pradeep:[email protected]:Signed CLA;john-pradeep > Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, > (r) mark resolved, (mc) my side of conflict, > (tc) their side of conflict, (s) show all options: tc > Resolved conflicted state of 'iclas.txt' > Summary of conflicts: > Text conflicts: 0 remaining (and 1 already resolved) > >> On Jan 6, 2016, at 4:14 PM, Craig L Russell <[email protected]> wrote: >> >> Robert Požarickij becomes robert-po-arickij for file name in icla handler. >> >> I'd expect this to be robert-pozarickij. >> >> Craig >> >> Craig L Russell >> Architect, Oracle >> http://db.apache.org/jdo >> 408 276-5638 mailto:[email protected] >> P.S. A good JDO? O, Gasp! >> > > Craig L Russell > Architect, Oracle > http://db.apache.org/jdo > 408 276-5638 mailto:[email protected] > P.S. A good JDO? O, Gasp! >
