[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: rev 1339 - trunk/subversion/clients/cmdline

From: Daniel Stenberg <daniel_at_haxx.se>
Date: 2002-02-21 08:16:46 CET

On 20 Feb 2002 cmpilato@collab.net wrote:

> > (message_from_editor) takes editor prefix as argument now, takes
> > 'include_status_output' boolean as argument to allow this to optionally
> > get switched off. Some cleanups.
> Dude, I hope you have a good reason for blowing away my work to generalize
> our use of the $EDITOR (see Revision 1295).

Not really. My not so "good reason" was mostly due to the big chunks of
rejects and that I didn't spot this properly.

My mistake. Sorry I am.

> Did you even update your working copy before committing?

It is quite hard to commit without doing so.

> Did you intelligently resolve the conflicts that should have occured in
> that update?

I could've hoped for at least a partial understanding from your side. I got a
pretty big version clash when you committed that old file of mine and I did
sort out all conflicts functioning-wise (AFAIK).

Anyone is free to rip out my commit again. If you think the previous
situation is better than the current. The alternative is that we fix the
current to get back the interface you added. I think that sounds like a
better way. And quite doable too.

I saw how my local edits were becoming pretty huge compared to what's in the
repo. I'm running out of time to spend on Subversion. I wanted to offer my
code before it would be totally impossible due to changes in the repo, as it
has been reviewed and re-worked a couple of times to actually become
something slightly good

I didn't consider this to be the final version of this file, but a little
step forwards. No, I didn't intend to "scrap" anyone's work.

If no one else does it, I'll bring back those fixes soonish.

      Daniel Stenberg - http://daniel.haxx.se - +46-705-44 31 77
   ech`echo xiun|tr nu oc|sed 'sx\([sx]\)\([xoi]\)xo un\2\1 is xg'`ol
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:09 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.