> My situation is some colleagues added modifications to 2.0.10 and I > want to rebase up to current. Since this development was done in the > v20 repo there doesn't seem to be a clear path to getting back to the > master repo. Maybe I am incorrect in this assumption? Your comment > makes it seem like you know a way to merge between the repos. How is > this done? > > The ability to pull change sets from any repository into any other repository is a fundamental feature of Mercurial, and it's what makes Pierre's current approach of stable-branch-by-clone as valid as stable-branch-in-repo. See the section "Sharing changes" on this page:
http://hgbook.red-bean.com/read/a-tour-of-mercurial-the-basics.html If you're using TortoiseHg, see this: http://tortoisehg.bitbucket.org/manual/2.0/sync.html -- You received this message because you are subscribed to the Google Groups "spyder" group. To view this discussion on the web visit https://groups.google.com/d/msg/spyderlib/-/dCIjekVptTkJ. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/spyderlib?hl=en.
