On Oct 19, 2010, at 3:04 PM, Chris Hostetter wrote: > > : FWIW, I get the sense that a lot of other projects deal with merges. What > do they do? > > I suspect they do merges properly and avoid this problem entirely. > > Bottom Line: if *all* merges happen at the top level, then this problem > won't exist -- mergeinfo props get added to individual files only when > individual file merges take place, or with merges from mixed working > revisions. Once a file gets those merge props, all future merges > in that tree interact with those individual file props even if the merge > has nothing to do with those files... > > http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword
I will go take a look at it, but as far as I could tell, I merged at the top level, but maybe IntelliJ does individual file merges and I wasn't aware of it (I believe I said merge trunk to branch_3x and then picked which revisions I wanted to apply). Perhaps we should put together some examples in Lucene's context that would give Lucene developers a deeper understanding. -Grant --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
