Re: Merging confuses renamed files

"Sander Striker" <striker@apache.org> writes:
 
> We should have at least two options: --ignore-ancestry and --notice-ancestry.

I absolutely agree. I've only been arguing about *default* behaviors
-- "what will surprise users the least?" But diff and merge should be
able to run in *either* mode.

  * I think 'svn merge' should honor ancestry by default, but I can
    see a use-case where someone wants merge to run faster. If a
    merge involves deleting and re-adding a large tree, it can be much
    faster to just apply path-based changes.

  * I think 'svn diff' should ignore ancestry by default, because it's
    so often used to compare unrelated trees. But I absolutely
    understand the the other use case: 'svn diff --notice-ancestry'
    can be used as a true preview of a merge, with much more detail
    than you get from 'svn merge --dry-run'.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 25 17:36:02 2003