Tree conflicts on merging into a branch

2010-04-28 Thread Matthias Weyh
Hello, I have seen an issue with subversion in which tree conflicts are being produced when creating a branch from a working copy in which not all files are at the same revision. This is happening when trying to merge changes into this branch. Please refer to the following sequence. Is this suppo

Re: Tree conflicts on merging into a branch

2010-05-07 Thread Stefan Sperling
[ Taking this discussion back from dev@ to users@ ] On Fri, May 07, 2010 at 05:15:25PM +1000, Daniel Becroft wrote: > it sounds > as though creating branches from mixed-revision working copies will > cause problems with merging. The implications of mixed-revision working copies on tree conflicts