headers
hgsubversion | 3 Mar 2012 00:37

push by durin42 - Include documentation in tarballs (fixes #317). on 2012-03-02 23:36 GMT

Revision: 8a226f0f99aa
Author:   Dirkjan Ochtman <dirkjan@...>
Date:     Thu Mar  1 04:28:18 2012
Log:      Include documentation in tarballs (fixes #317).
http://code.google.com/p/hgsubversion/source/detail?r=8a226f0f99aa

Modified:
  /MANIFEST.in

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To post to this group, send email to hgsubversion@...
To unsubscribe from this group, send email to hgsubversion+unsubscribe@...
For more options, visit this group at http://groups.google.com/group/hgsubversion?hl=en.
Permalink | Reply | 0 comments |
headers
Russian Rocket | 29 Mar 2012 20:33
Picon

SVN-branch rebase possible?

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 :-). )

I apologize if my request sounds nuts.  Feel free to (politely) inform
me of that. :-)

Thanks in advance for any help!

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To post to this group, send email to hgsubversion@...
(Continue reading)

Permalink | Reply | 4 comments |
headers
Augie Fackler | 29 Mar 2012 23:38
Picon
Gravatar

Re: SVN-branch rebase possible?


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 :-). )

You'd want to not pass --keepbranches, and definitely pass --keep to the built-in hg rebase command
(without --svn). You're on your own as far as crafting the exact command.

Do you want to have a single commit land in svn for the rebase, or all the individual commits? Just using
rebase will cause each commit to be replayed on trunk one at a time, which may not be what you have in mind.
(Continue reading)

Permalink | Reply | 3 comments |
headers
Alexey Loginov | 30 Mar 2012 15:25
Picon

Re: SVN-branch rebase possible?

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 :-). )
>
> You'd want to not pass --keepbranches, and definitely pass --keep to the built-in hg rebase command
(without --svn). You're on your own as far as crafting the exact command.
(Continue reading)

Permalink | Reply | 2 comments |
headers
Augie Fackler | 30 Mar 2012 16:39
Picon
Gravatar

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 :-). )
(Continue reading)

Permalink | Reply | 1 comment |

Gmane