Re: Rename tracking for merges

2012-05-05 Thread Stefan Sperling
On Sat, May 05, 2012 at 11:57:07AM +0200, Stefan Sperling wrote: > I would prefer > if those trying to fix merge would think more about tree conflict resolution > than anything else. Oh, and BTW, those who are new to the project and would like to learn more about the subject of tree conflicts, my

Re: Rename tracking for merges

2012-05-05 Thread Stefan Sperling
On Tue, May 01, 2012 at 10:02:10AM +0200, Stefan Fuhrmann wrote: > Hi Mergeans, > > One of main sources for merge conflicts in SVN > is its inability to follow renames. Philip and > (the other) Stefan already made some attempts to > solve that issue on the client side: > > http://svn.apache.org/r

Re: Rename tracking for merges

2012-05-02 Thread Alexey Neyman
Hi Stefan, Mind a couple of questions from potential user of this feature? On Tuesday, May 01, 2012 01:02:10 am Stefan Fuhrmann wrote: > * "continue" from-path[@peg] [ from-rev ] to-path >Specifies that the merge-relevant change history >of from-path,from-rev is continued by to-path, >

Re: Rename tracking for merges

2012-05-01 Thread Julian Foad
Hi Stefan. Overall comment: yes, I think something like this could form the basis of a data storage for tracking renames. We should think a bit more about how we would expect this to be used initially -- whether we make 'svn copy' and/or 'svn move' populate this data, or provide some other UI