From: Petr Baudis <pasky@ucw.cz>
Date: Sun, 08 May 2005 17:30:03 GMT
Subject: Re: [PATCH Cogito] Make use of external editor work like CVS
Message-ID: <20050508173003.GY9495@pasky.ji.cz>
In-Reply-To: <1115572667.9031.139.camel@pegasus>

Dear diary, on Sun, May 08, 2005 at 07:17:47PM CEST, I got a letter
where Marcel Holtmann <marcel@holtmann.org> told me that...
> > > I will check what I can do, but I don't really care that much about the
> > > patch size ;)
> > 
> > But I do. :-)
> 
> Sometime you don't have any other choice, because diff is not perfect.
> Do you wanna apply that patch or should I change the mktemp templates
> first?

It looks like it'll be most painless when I just reinvent parts of your
patch here locally and you can send me patches on top of that.

> > > > > Index: cg-commit
> > > > > ===================================================================
> > > > > --- f00d7589973e8ea65d2264f5fbac82e1b217dc8f/cg-commit  (mode:100755)
> > > > > +++ cb61efa8a01400150162af9b0f3773f21d502fe9/cg-commit  (mode:100755)
> > > > > @@ -94,30 +78,55 @@
> > > > >  		echo "$uri" >>$LOGMSG
> > > > >  		[ "$msgs" ] && echo "$uri"
> > > > >  	done
> > > > > -	echo >>$LOGMSG
> > > > > +else
> > > > > +	first=1
> > > > >  fi
> > > > > -first=1
> > > > > +
> > > > >  for msg in "${msgs[@]}"; do
> > > > >  	if [ "$first" ]; then
> > > > >  		first=
> > > > >  	else
> > > > >  		echo >>$LOGMSG
> > > > >  	fi
> > > > > -	echo $msg | fmt >>$LOGMSG
> > > > > +	echo $msg | fmt -s -w 74 >>$LOGMSG
> > > > >  done
> > > > > +
> > > > > +if [ "$first" ]; then
> > > > > +	echo >>$LOGMSG
> > > > > +fi
> > > > 
> > > > This mess is still here.
> > > 
> > > That is not mess. Think about it. If we have messages provided by -m we
> > > want an empty line between the merge message and the the first commit
> > > message. And we don't wanna have an extra empty line at the top if you
> > > provide a commit messages via -m.
> > 
> > But, that's the current behaviour, isn't it?
> 
> No it is not, because with my change the messages are at the top and
> before the CG: lines.

I'm sorry but I still don't get what are you trying to say. :-)
As far as I can see, the output will be the same, except that with to -m
arguments, there won't be the extra newline for the merge message - and
we agreed we want it, didn't we?

I'll just drop this chunk. :-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor