Hello, --- PROBLEM Using the --reintegrate option, merging the same two branches twice (from reverting 3 merged files after the first merge) causes many non-existent tree conflicts, along with text conflicts, after the second merge.
--- DESCRIPTION I had to merge branch A into branch B. So, I checked out B, then ran svn merge --reintegrate A B. This worked well. However, I didn't want the last 3 check-ins from A to be in B. So, I ran svn revert on those few files that I didn't want merged in, then checked in B back into svn. So far, so good, right? I then wanted to merge those few files from A back into B. So, I checked out B again (which had all of A except for those 3 files), and re-ran svn merge --reintegrate A B. I naturally expected to only see the modification of those 3 files, however I instead got 13 tree conflicts, and 4 text conflicts. Why? --- STEPS (Assuming REPO="your://svn/url") 1) svn co $REPO/branch/B 2) svn merge --reintegrate $REPO/branch/A B 3) svn revert path/to/file1 4) Repeat step 3 (for clarity) twice for file2 and file3 5) svn ci B -m "Merged A into B" 6) rm -rf B 7) svn co $REPO/branch/B 8) svn merge --reintegrate $REPO/branch/A B 9) Enjoy the "Tree Conflict Show" --- USER INFO Linux 64-bit: 2.6.18-128.el5xen x86_64 GNU/Linux Svn release;: 1.6.9 (server is 1.6.4) No compilation/configuration options - used pre-packaged binary. Using FSFS Thanks in advance
