I'm currently using svn 1.8.5 on the client and 1.8.3 on the server.
If you attempt to "svn merge" a text file from the command-line where the same line has been modified in both file versions, you will see a report of the conflict, followed by this menu: Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, (mc) my side of conflict, (tc) their side of conflict, (s) show all options If you then choose "m" for merge, you will see this menu: Select: (1) use their version, (2) use your version, (12) their version first, then yours, (21) your version first, then theirs, (e1) edit their version and use the result, (e2) edit your version and use the result, (eb) edit both versions and use the result, (p) postpone this conflicting section leaving conflict markers, (a) abort file merge and return to main menu Choosing either (12) or (21) here will perform an additive merge where both changes are included in the resulting file. We need this behavior for one of our standard use cases, and therefore we would like to script it, but I don't see a way to perform this type of additive merge in a non-interactive way. None of the standard --accept options that can be used with "svn merge" would seem to trigger this behavior. Am I missing something, or are these additive merges only possible in interactive mode? Thanks in advance for any replies. -JP
