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

Daniel Stenberg <daniel@haxx.se> writes:

> 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.

's not that big a deal. Were everything not safe (fingers crossed :-)
under version control, I might have been more bothered.

> > 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).

That's fair. Since a good chunk of the functionality moved to util.c, you
wouldn't have seen conflicts there.

> 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.

Perhaps we both could have saved ourselves some trouble had we
(a) published our plans to make big changes prior to making them, and
(b) been more attentive to the changes others were making. I wouldn't
have done the re-org had I known you were still actively coding there,
and I'm sure I could have found that out by posting a little message
to the list:

   "I'm about to start abstracting our use of $EDITOR in the
   command-line client."

cuz I bet you would've told me to hold off on that. ;-)

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

A'ight. Sorry for the initial slam.

---------------------------------------------------------------------
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