On 06/17/2013 12:39 PM, C M wrote: > I think my earlier mistake might have been that I was using the > --reintegrate option. > Without it, I make some progress, but still not quite what I am expecting. > > Again, given that trunk is empty, why the "C" (tree conflicts)? I would > expect all of then to be "A" (additions), no? > > The DEV_WC currently only shows the two dirs which SVN correctly recognized > as additions. > > c:\Temp\DEV_WC>svn merge --dry-run --ignore-ancestry > https://path_to_branch/SCR_BR/ > > --- Merging r1191 through r1245 into '.':
Do these revision numbers (r1191 and r1245) match what you'd expect? What happens if you do this: svn diff -r1190:1245 https://path_to_branch/SCR_BR/ Do you see exactly the additions that you would expect to see? -- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Enterprise Cloud Development
signature.asc
Description: OpenPGP digital signature
