10

I think I must be missing something fundamental in my understanding which is preventing me from getting my head around this.

In what situations would you want to use the --ignore-ancestry option when performing a merge? It is my understanding that using this option prevents the mergeinfo property from being updated on the target branch, but in what situations would you not want the mergeinfo to be recorded?

BadAtMaths
  • 215
  • 2
  • 7
  • 2
    Have you [read this](http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.ancestry)? – Richard Smith Sep 27 '16 at 21:50

1 Answers1

7

You would use --ignore-ancestry if you wanted to merge same file paths as same files regardless of whether SVN thinks that they are different because their version id suggests to it that they are different.

I've had experiences where a SVN would delete directories in my branch that were not in my merge source unless I used --ignore-ancestry.

This would mainly happen if you deleted and committed, then copied into your local branch as opposed to restoring the directory in the baseline and merging it to your branch.  

Alex Weitz
  • 3,199
  • 4
  • 34
  • 57
Dave
  • 618
  • 6
  • 17
  • Oh I think this makes sense to me. So if I had a merge from branch A to branch B, and in branch B I had delete int.c and replaced it with another file called int.c, would any changes to the original int.c in branch A be patched onto the new file in branch B with the --ignore-ancestry tag? Even though they are unrelated? – BadAtMaths Jan 25 '17 at 20:30