Re: Experimental Git repository available

[David Reynolds]

On 19 Jun 2008, at 6:07 pm, Jacob Kaplan-Moss wrote:

> If you know the correct incantation to add other git-svn-created
> branches, feel free to school me :)

I think Brian Rosner covered pulling in all branches from svn on his  
screencast about django and git [0] but I can't off the top of my  
head remember how he did it.

http://oebfare.com/blog/2008/jan/23/using-git-django-screencast/

-- 
David Reynolds
[EMAIL PROTECTED]


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Jeffrey Gelens]

On Jun 20, 3:21 am, "Waylan Limberg" <[EMAIL PROTECTED]> wrote:
> On Thu, Jun 19, 2008 at 1:52 PM, Alexander Solovyov
>
> <[EMAIL PROTECTED]> wrote:
>
> > On Thu, Jun 19, 2008 at 8:09 PM, Jacob Kaplan-Moss
> > <[EMAIL PROTECTED]> wrote:
> >> Yeah, hgsvn is one-way,
>
> > H
>
> >>hg help convert
> > hg convert [OPTION]... SOURCE [DEST [REVMAP]]
>
> > Convert a foreign SCM repository to a Mercurial one.
>
> True, but that doesn't address pushing changes back to SVN, at least
> not practically. Mercurial's own docs [1] admit this is a problem
> needing improvement. Compare that with git-svn's dcommit command [2].


Actually there is an hgpushsvn included with the hgsvn package. As far
as I tested it is working. I'm not sure why it isn't in the hgsvn
docs, but I guess it is not tested well enough yet.

--
Jeffrey Gelens
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Gary Wilson Jr.]

Marc Fargas wrote:
> El jue, 19-06-2008 a las 14:03 -0700, Michael Elsdörfer escribió:
>> FWIW (I'm currently playing around with all three of them), bazaar
>> appears to support pushing into svn as well.
> 
> Yes, with bzr-svn.

Be advised, though, that currently bzr-svn will dump out a ton of svn 
properties into your repo [1].  Then, if you say to yourself "what the 
heck just happened!?" and go revert that revision (removing the 
properties), you will not be able to ever branch the repo again using 
bzr-svn until this bug [2] is fixed.  Wish I would have known that 
before I did it :)

Gary

[1] 
http://samba.org/~jelmer/bzr-svn/FAQ.html#bzr-svn-sets-all-kinds-of-file-properties-when-pushing-revisions-into-subversion-is-this-really-necessary
[2] https://bugs.launchpad.net/bzr-svn/+bug/174690

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Jeremy Dunck]

On Thu, Jun 19, 2008 at 5:02 PM, Rob Hudson <[EMAIL PROTECTED]> wrote:
>
> On 6/19/08, Rob Hudson <[EMAIL PROTECTED]> wrote:
>> Use the `-T`, `-t`, `-b` flags, or `-s` if the project has a "standard
>>  layout".  This should bring over branches and tags as well.

Oh, er, uh, I didn't notice only trunk was in the published repo-- I
assumed it was a clone problem.

Yeah, what Rob said, except that for sure, django is in the standard
format, so this should work:
 git-svn init -s http://code.djangoproject.com/svn/

But I think that just editing .git/config to add this should work:

[svn-remote "svn"]
   url = http://code.djangoproject.com/svn
   fetch = trunk:refs/remotes/trunk
   branches = branches/*:refs/remotes/*
   tags = tags/*:refs/remotes/tags/*

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Rob Hudson]

On 6/19/08, Rob Hudson <[EMAIL PROTECTED]> wrote:
> Use the `-T`, `-t`, `-b` flags, or `-s` if the project has a "standard
>  layout".  This should bring over branches and tags as well.

I forgot to reference the man page (which was in my clipboard):
http://www.kernel.org/pub/software/scm/git/docs/git-svn.html

-Rob

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Rob Hudson]

On 6/19/08, Jacob Kaplan-Moss <[EMAIL PROTECTED]> wrote:
>
>  On Thu, Jun 19, 2008 at 11:55 AM, [EMAIL PROTECTED]
>  <[EMAIL PROTECTED]> wrote:
>  > Is this only going to offer the trunk branch?
>
>
> Until I learn more about Git, yes :)
>
>  If you know the correct incantation to add other git-svn-created
>  branches, feel free to school me :)
>
>
>  Jacob

Use the `-T`, `-t`, `-b` flags, or `-s` if the project has a "standard
layout".  This should bring over branches and tags as well.

-Rob
-- 
"ROCK OUT!"  \m/.  .\m/

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Tom Tobin]

On Thu, Jun 19, 2008 at 4:27 PM, Marc Fargas <[EMAIL PROTECTED]> wrote:
> El jue, 19-06-2008 a las 14:03 -0700, Michael Elsdörfer escribió:
>> FWIW (I'm currently playing around with all three of them), bazaar
>> appears to support pushing into svn as well.
>
> Yes, with bzr-svn. Didn't play too much with that one. But Bazaar is
> slow, *really* slow.

I settled on Bazaar after extensively using both Git and Mercurial;
it's *not* that slow, and it keeps getting faster with aggressive
monthly releases.  (But alas, this isn't the right place for DVCS
advocacy.)  ^_^

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Michael Elsdörfer]

> Yeah, hgsvn is one-way, which git-svn has the "dcommit" command
> which'll commit back to SVN. I'm really not much of a git fan, but
> git-svn makes a better svn than svn does, if you know what I mean.

FWIW (I'm currently playing around with all three of them), bazaar
appears to support pushing into svn as well.

Michael


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Ben Ford]

> Something like this?
> http://hg.dpaste.com/django/ 

Yeah I use that one at the moment, I was getting at a more thing. I'm sure
that's more difficult to do with HG then GIT and like Jacob said, it's a
moot point anyway :-)

Ben

2008/6/19 Ariel Mauricio Nunez Gomez <[EMAIL PROTECTED]>:

>
> 
>
>
> >
>


-- 
Regards,
Ben Ford
[EMAIL PROTECTED]
+447792598685

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Jeremy Dunck]

I'm just guessing, but I think git-clone doesn't pull in remotes, so
that our clones are getting whatever's your master, hence trunk.
You can make a local copy of a remote branch like so:

git-checkout -b local/branchname branchname

There's no magic in the "local" prefix, it's just to distinguish the
remote branch of the same name.

Plus
 git-update-server-info
may be needed...

On Thu, Jun 19, 2008 at 12:07 PM, Jacob Kaplan-Moss
<[EMAIL PROTECTED]> wrote:
>
> On Thu, Jun 19, 2008 at 11:55 AM, [EMAIL PROTECTED]
> <[EMAIL PROTECTED]> wrote:
>> Is this only going to offer the trunk branch?
>
> Until I learn more about Git, yes :)
>
> If you know the correct incantation to add other git-svn-created
> branches, feel free to school me :)
>
> Jacob
>
> >
>

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Waylan Limberg]

On Thu, Jun 19, 2008 at 1:52 PM, Alexander Solovyov
<[EMAIL PROTECTED]> wrote:
>
> On Thu, Jun 19, 2008 at 8:09 PM, Jacob Kaplan-Moss
> <[EMAIL PROTECTED]> wrote:
>> Yeah, hgsvn is one-way,
>
> H
>
>>hg help convert
> hg convert [OPTION]... SOURCE [DEST [REVMAP]]
>
> Convert a foreign SCM repository to a Mercurial one.

True, but that doesn't address pushing changes back to SVN, at least
not practically. Mercurial's own docs [1] admit this is a problem
needing improvement. Compare that with git-svn's dcommit command [2].

[1]: 
http://www.selenic.com/mercurial/wiki/index.cgi/WorkingWithSubversion#head-15564b76f3172721218d34c912aa0c31e156a94b
[2]: http://www.kernel.org/pub/software/scm/git/docs/git-svn.html


-- 

Waylan Limberg
[EMAIL PROTECTED]

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[dankelley]

You're a gentleman and a scholar, Jacob.

I think you'll find that git is a tool that feels good in the hand.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Alexander Solovyov]

On Thu, Jun 19, 2008 at 8:09 PM, Jacob Kaplan-Moss
<[EMAIL PROTECTED]> wrote:
>
> On Thu, Jun 19, 2008 at 11:59 AM, Ben Ford <[EMAIL PROTECTED]> wrote:
>> This sounds like a nice idea... Any plans to do a mercurial repo (a-la the
>> documentation refactor)? Am I right in thinking that support of SVN <=> HG
>> is less complete than GIT <=> SVN?
>
> Yeah, hgsvn is one-way,

H

>hg help convert
hg convert [OPTION]... SOURCE [DEST [REVMAP]]

Convert a foreign SCM repository to a Mercurial one.
...
Accepted destination formats:
- Mercurial
- Subversion (history on branches is not preserved)

That's hg 1.0.1

-- 
Alexander

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Tom Tobin]

On Thu, Jun 19, 2008 at 11:39 AM, Jacob Kaplan-Moss
<[EMAIL PROTECTED]> wrote:
> I've published an experimental Git clone of Django's SVN repository
> (created with git-svn). If you're a Git user and want to use this
> repository, be my guest. Please still upload patches to Trac for
> review, but mention you're using my clone so I can more easily apply
> patches from you. Also let me know if you publish your clones
> anywhere; I'll add 'em as remotes.

Noted this on the appropriate wiki page (and cleaned up the section on
DVCS mirrors):

http://code.djangoproject.com/wiki/DjangoBranches

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Jacob Kaplan-Moss]

On Thu, Jun 19, 2008 at 11:59 AM, Ben Ford <[EMAIL PROTECTED]> wrote:
> This sounds like a nice idea... Any plans to do a mercurial repo (a-la the
> documentation refactor)? Am I right in thinking that support of SVN <=> HG
> is less complete than GIT <=> SVN?

Yeah, hgsvn is one-way, which git-svn has the "dcommit" command
which'll commit back to SVN. I'm really not much of a git fan, but
git-svn makes a better svn than svn does, if you know what I mean.

Jacob

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Jacob Kaplan-Moss]

On Thu, Jun 19, 2008 at 11:55 AM, [EMAIL PROTECTED]
<[EMAIL PROTECTED]> wrote:
> Is this only going to offer the trunk branch?

Until I learn more about Git, yes :)

If you know the correct incantation to add other git-svn-created
branches, feel free to school me :)

Jacob

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[Ben Ford]

Hi Jacob,

This sounds like a nice idea... Any plans to do a mercurial repo (a-la the
documentation refactor)? Am I right in thinking that support of SVN <=> HG
is less complete than GIT <=> SVN?

Cheers,
Ben

2008/6/19 [EMAIL PROTECTED] <[EMAIL PROTECTED]>:

>
> Is this only going to offer the trunk branch?
>
> On Jun 19, 11:39 am, "Jacob Kaplan-Moss" <[EMAIL PROTECTED]>
> wrote:
> > Hi folks --
> >
> > I've published an experimental Git clone of Django's SVN repository
> > (created with git-svn). If you're a Git user and want to use this
> > repository, be my guest. Please still upload patches to Trac for
> > review, but mention you're using my clone so I can more easily apply
> > patches from you. Also let me know if you publish your clones
> > anywhere; I'll add 'em as remotes.
> >
> > Note that this is in no way official, this is just me fooling around
> > with new tech. It's entirely possible that this won't actually save
> > anyone any time, but since I'm fooling with Git I thought I'd give
> > this a shot. Please don't try to turn this into a "Django should use
> > Git!" thread; if you do I'll just ignore you. We're not switching from
> > SVN any time in the foreseeable future.
> >
> > OK, so the details:
> >
> > Repository: git://djangoproject.com/django
> > Gitweb:http://code.djangoproject.com/git/?p=django
> >
> > Jacob
> >
>


-- 
Regards,
Ben Ford
[EMAIL PROTECTED]
+447792598685

--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---

Re: Experimental Git repository available

[[EMAIL PROTECTED]]

Is this only going to offer the trunk branch?

On Jun 19, 11:39 am, "Jacob Kaplan-Moss" <[EMAIL PROTECTED]>
wrote:
> Hi folks --
>
> I've published an experimental Git clone of Django's SVN repository
> (created with git-svn). If you're a Git user and want to use this
> repository, be my guest. Please still upload patches to Trac for
> review, but mention you're using my clone so I can more easily apply
> patches from you. Also let me know if you publish your clones
> anywhere; I'll add 'em as remotes.
>
> Note that this is in no way official, this is just me fooling around
> with new tech. It's entirely possible that this won't actually save
> anyone any time, but since I'm fooling with Git I thought I'd give
> this a shot. Please don't try to turn this into a "Django should use
> Git!" thread; if you do I'll just ignore you. We're not switching from
> SVN any time in the foreseeable future.
>
> OK, so the details:
>
> Repository: git://djangoproject.com/django
> Gitweb:http://code.djangoproject.com/git/?p=django
>
> Jacob
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django developers" group.
To post to this group, send email to django-developers@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-developers?hl=en
-~--~~~~--~~--~--~---