Re: [PATCH] Best Practices

Scott Lamb <slamb@slamb.org> writes:
> I've had bad luck before with merging not being smart enough to
> realize a change has already been done, especially when I've had to
> adapt it a bit. This would say so explicitly.

I don't see why the --no-merge flag would address that problem, if
running indent before the second update doesn't address it. In any
case, we have a much more general plan for handling repeated merges
(not started implementing yet, but it shouldn't require the user to be
aware of the reindent).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 8 21:10:14 2002