Marat Radchenko <marat@xxxxxxxxxxxxxxxx> writes: >> > * You must not do 'inverted merges'. Old HEAD must be reachable from >> > new HEAD by first-parent traversal. >> >> I am not sure what you mean by this to properly assess how >> significant this limitation is. Care to draw a simple picture? > > SVN doesn't support nonlinear history (except merge-info crutch). > ... > And now the *bad* case. You have the same initial history but do *inverted merge*: That is a bad way to answer a question that asks "what do you mean by an 'inverted merge', which is not in our normal lexicon?" ;-) You must not merge the current tip of SVN server *into* the work you did on top of a past state you obtained from the SVN server. Check out the current state from the SVN side, and merge your work into it instead. or something like that is what people would understand without introducing a new/unused word to the world. And > A -- D -- E -- F -- G' > \ / > B -- C ---------/ > ^ > | > Previous branch tip this illustrates the topology you meant reasonably well, especially if you marked D, E and F as "your own work" (as opposed to what the server side did in the meantime while you worked, i.e. B and C). Thanks for a clarification. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html