Re: RFC: change 'svn merge' default behavior.

Ben Collins-Sussman <sussman@collab.net> writes:
> That said, here's a simple patch that does 'merge ignores ancestry'
> ==> 'merge notices ancestry'. It only changes the internals of the
> cmdline client.

+1 to everything Ben said.

The important thing is that we fix the merge misbehavior -- that's the
one that could really burn people.

Our 'diff' behavior, on the other hand, can be reconsidered/tweaked
after 1.0, without major pain for users. We shouldn't be holding up
the major merge fix because of the much more bikesheddy questions of
how diff should behave, whether it must match merge, etc. The kinds
of changes we might make to diff's behavior later are (I'm guessing
here, but it's an educated guess) not likely to break many automated
scripts or procedures. This is 'svn diff' we're talking about, not
'update' :-).

Can we please consense on Ben's patch for now to fix this merge bug?

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 16 22:29:06 2004