Re: Introduce and use the %KEY?TRUE:FALSE% template token

[Ralf Wildenhues]

* Akim Demaille wrote on Mon, Nov 19, 2007 at 03:29:50PM CET:
>
>>
>> |  # transform($TOKEN, \%PAIRS)
>> | -# ==========================
>> | +# ===========================
>>
>> Huh?
>
> Due to the smashing of white spaces: the patch actually
> puts a space between transform and (.

Hmm, maybe that's why piping your mail to git-apply barfed.
It kept me wondering, but `patch -p1' isn't far away, luckily.
Weird, I've always thought git-diff takes care to recompute the
SHA1's for the diff -w/-b ...

>> Your patch messes up indentation in this function, several places.
>
> I know, but Automake is actually quite messy: shouldn't spaces
> be normalized to tabs when possible?

I guess so.  No need to do so with code you don't change, though.

> Because of this, I used diff -w, hence the weird result.

Please say so next time.

>> FWIW, the multiple meanings of ? and other characters in perl regexes
>> make them really difficult to read, IMVHO.  Not your fault, of course.
>
> That's why I started to use /x to make it more readable.

Which is good (once I learned about /x and stopped wondering about
all that white space in there).

>> Otherwise fine with me.  Please rebase against master before committing
>> (to avoid a merge commit), thanks.
>
> Err...  I'll have to wait to have Benoît with me to do that :)

If you have your patch at the top of master, do this:

  # ensure master branch is checked out:
  git checkout master
  # create a new branch that is identical:
  git checkout -b my-ternary
  # now, go back to master and reset that to before the patch:
  git checkout master
  git reset HEAD^
  # get upstream changes; this should be a fast-forward now:
  git pull
  # ensure by inspection that there was no merge commit:
  git log
  # now go back and rebase your change:
  git checkout my-ternary
  git rebase master
  # You may have to fix some conflicts here...

  # When done rebasing, you can pull the ternary change into master
  # and push that:
  git checkout master
  git merge my-ternary
  # inspection:
  git log; git show
  # publish:
  git push

  # finally, you should not need the branch any more:
  git branch -d my-ternary

HTH.  Untested.

Cheers,
Ralf