Re: SVN-branch rebase possible?
On Mar 30, 2012, at 8:25 AM, Alexey Loginov wrote:
> Augie, thanks for the reply! See follow-up inline.
> On Thu, Mar 29, 2012 at 5:38 PM, Augie Fackler <durin42@...> wrote:
>> On Mar 29, 2012, at 1:33 PM, Russian Rocket wrote:
>>> Hi all,
>>> I'm starting to use hgsubversion (and regular Mercurial) to work on a
>>> largish SVN repository (~80K revisions that took two weeks to pull
>>> with hgsubversion). I have a subversion branch that I'd like to
>>> rebase onto trunk. I'd love to be able to do it in Mercurial/
>>> hgsubversion, rather than using the messy subversion incantations.
>>> I suspect that with the need for linear history, rebasing from an SVN
>>> branch onto trunk is not possible (e.g., hg up BRANCH && hg rebase -d
>>> default --svn --keepbranches). Still, I'd like to confirm that such a
>>> command is expected to tell me "Nothing to rebase!"
>>> Now, if I insisted on rebasing via Mercurial/hgsubversion, could I try
>>> the above but without the --svn argument? Perhaps, with --keep, maybe
>>> without --keepbranches, I could still make subversion happy? The hope
>>> is that adding --keep would avoid non-linearity? Presumably, I'd end
>>> up with a copy of the commits on BRANCH, replicated on the end of
>>> trunk. Perhaps, I also have to skip --keepbranches to preserve
>>> linearity? That would likely mean that the replicated changesets go
>>> onto trunk in subversion? (This I shouldn't do . )