FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Fedora Development

 
 
LinkBack Thread Tools
 
Old 12-06-2010, 07:33 PM
Jesse Keating
 
Default Request for comment: Potential change to dist-git branch structure

On 12/04/2010 09:52 AM, Bruno Wolff III wrote:
> On Fri, Dec 03, 2010 at 16:34:05 -0800,
> Jesse Keating <jkeating@redhat.com> wrote:
>> "f14/user/fred/topic/mybranch" or other such craziness. When I went to
>> test this, I realized that git won't allow you to have both "f14" and
>> "f14/topic" as branches, because of the way the git metadata works on
>
> Does there need to be some sort of check for / in maintainer created
> branch names to prevent problems?

For the fedpkg commands where this would come into place, perhaps. Like
switch-branch. Hard to judge what will cause problems though.

>
>> My hope is that the impact would be minimal. Git allows branch renames,
>> and can successfully rename "f14/master" to "f14". All the history is
>> renamed. We should be able to do this without an outage of the git server.
>
> Is this going to break things for people that having set up origin tracking
> for multiple releases in the same repo?

Can you explain this a bit more please?

--
Jesse Keating
Fedora -- Freedom˛ is a feature!
identi.ca: http://identi.ca/jkeating
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 
Old 12-06-2010, 07:44 PM
Bruno Wolff III
 
Default Request for comment: Potential change to dist-git branch structure

On Mon, Dec 06, 2010 at 12:33:40 -0800,
Jesse Keating <jkeating@redhat.com> wrote:
> On 12/04/2010 09:52 AM, Bruno Wolff III wrote:
> >
> > Is this going to break things for people that having set up origin tracking
> > for multiple releases in the same repo?
>
> Can you explain this a bit more please?

I currently run:
git branch -t f12 origin/f12/master
git branch -t f13 origin/f13/master
git branch -t f14 origin/f14/master

Am I going to need to do anything when the origin branch names change?
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 
Old 12-06-2010, 10:04 PM
Jesse Keating
 
Default Request for comment: Potential change to dist-git branch structure

On 12/06/2010 01:10 AM, Andreas Schwab wrote:
> Jesse Keating <jkeating@redhat.com> writes:
>
>> However, if a user had a local
>> branch of f14 or f14/master they will be left with mismatched
>> .git/config entries. In this case it's easiest to delete the local
>> branch (git branch -d f14) and check it out again.
>
> Or git branch --set-upstream.
>
> Andreas.
>

Yes, there are a couple ways of fixing this. I noted the easiest

--
Jesse Keating
Fedora -- Freedom˛ is a feature!
identi.ca: http://identi.ca/jkeating
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 
Old 12-06-2010, 10:11 PM
Jesse Keating
 
Default Request for comment: Potential change to dist-git branch structure

On 12/06/2010 12:44 PM, Bruno Wolff III wrote:
> On Mon, Dec 06, 2010 at 12:33:40 -0800,
> Jesse Keating <jkeating@redhat.com> wrote:
>> On 12/04/2010 09:52 AM, Bruno Wolff III wrote:
>>>
>>> Is this going to break things for people that having set up origin tracking
>>> for multiple releases in the same repo?
>>
>> Can you explain this a bit more please?
>
> I currently run:
> git branch -t f12 origin/f12/master
> git branch -t f13 origin/f13/master
> git branch -t f14 origin/f14/master
>
> Am I going to need to do anything when the origin branch names change?

Yes, you'd need to reset their merge points or delete/recreate the local
branches.

--
Jesse Keating
Fedora -- Freedom˛ is a feature!
identi.ca: http://identi.ca/jkeating
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 
Old 12-08-2010, 11:11 PM
Jesse Keating
 
Default Request for comment: Potential change to dist-git branch structure

On 12/03/2010 04:34 PM, Jesse Keating wrote:
> So please, tell me what you think!

I've created a wiki page to track this effort. Feel free to reply to
this email thread or to comment on the wiki page:

https://fedoraproject.org/wiki/Dist_Git_Branch_Proposal

--
Jesse Keating
Fedora -- Freedom˛ is a feature!
identi.ca: http://identi.ca/jkeating
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 

Thread Tools




All times are GMT. The time now is 01:04 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright ©2007 - 2008, www.linux-archive.org