* Johann Oskarsson <Johann> writes:
> Steve Youngs <steve@xxxxxxxxxxx> writes:
>> * Johann Oskarsson <Johann> writes:
>>
>> > I don't want to be afraid you'll treat it as a merge request
>> > each time I commit a check-point.
>>
>> Simple: If it lands on sxemacs-patches I treat it as a merge
>> request. If you don't want something you commit to merged, _DON'T_
>> send a commit log to the list.
>>
>> If you want a patch to be discussed (and not merged by me until
>> possibly after the discussion), send it to sxemacs-devel.
> Hmm, that's damn annoying becouse I'm not sure how I can control it
> from the patch log to which list to send it...
You don't control it from your patch logs, you control it from your
tla hooks.
(Info-goto-node "(sppm)Patches")
goes a long way to explaining everything you need. If you follow my
suggestions in there it is simple...
- You want to commit something to your repo that you _don't_ want in
my repo for some reason (a star-merge from me) you would...
$ NOHOOKS=1 tla commit
- You are working on something that you think needs to be discussed
on -devel. _BEFORE_ you commit...
$ tla changes --diffs > somefile.diff
Send somefile.diff to sxemacs-devel for discussion.
- You want to commit something to your repo and have me merge it
into mine...
$ tla commit
Your tla commit hooks should send to sxemacs-patches
> *And* this contradicts to what we discussed about the Qt branch.
Bullshit! Or at least miscommunicationshit. When I said to you to
send patch logs to sxemacs-patches for the QT crap, I really meant for
stuff you wanted me to merge.
I'm just trying to think of a way so that you don't annoy us with all
your commits to the QT branch that aren't ready for merge into the
mainline, and at the same time, I can stay informed.
How about a sxemacs-qt mailing list? You could set the commit hook
for the QT branch to send to sxemacs-qt@xxxxxxxxxxxx I could look at
that list every now and then to see what's going on. And when it
comes time for me to merge in the QT stuff you just jump up and down
until I notice you want something.
I won't create the list until I hear from you.
> You *just* live to make my life more complicated, don't you? ;)
It's not in my job description, so I consider it a perk.
> I've no trouble changing my automagic patch log mailings to the devel
> list as such.
Oh please don't. Just set things up as I've described here and in
sppm.texi. All will become clear, all will be happy, all will be one
step closer to enlightenment.
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve@xxxxxxxxxxx>---|
pgpp8aw9IBIfK.pgp
Description: PGP signature
|