Request for comment: Potential change to dist-git branch structure

2010-12-03 Thread Jesse Keating
I'm working on fixing a few long standing bugs in fedpkg that have to do with our branch structure (https://bugzilla.redhat.com/show_bug.cgi?id=619979 and https://bugzilla.redhat.com/show_bug.cgi?id=622592). This has me examining our branch structure again and trying to remember why exactly I chos

Re: Request for comment: Potential change to dist-git branch structure

2010-12-03 Thread Garrett Holmstrom
On 12/3/2010 18:34, Jesse Keating wrote: > The original thought was to have top level branches that are named after > distribution releases, eg "f14", "f15", "el5". Then we would force > branches of those branches use a naming structure of "f14/topic". The > reason was so that our tooling could l

Re: Request for comment: Potential change to dist-git branch structure

2010-12-04 Thread Matej Cepl
Dne 4.12.2010 06:33, Garrett Holmstrom napsal(a): > Why tie branch names down to specific releases? While that scheme makes > it easy for fedpkg to guess what release to attempt to build against > when one only cares about one release, it makes little sense to call a > branch "f14-rh123456" whe

Re: Request for comment: Potential change to dist-git branch structure

2010-12-04 Thread Kalev Lember
On 12/04/2010 12:19 PM, Matej Cepl wrote: > Related issue I have with the Fedora git repositories is that one cannot > remove any branch once it is created. After I have created in bitlbee > repo two topic branches, only to find out that I cannot remove them > after the merge. I can understand need

Re: Request for comment: Potential change to dist-git branch structure

2010-12-04 Thread Severin Gehwolf
- "Jesse Keating" wrote: > I'm working on fixing a few long standing bugs in fedpkg that have to > do > with our branch structure > (https://bugzilla.redhat.com/show_bug.cgi?id=619979 and > https://bugzilla.redhat.com/show_bug.cgi?id=622592). > > This has me examining our branch structure a

Re: Request for comment: Potential change to dist-git branch structure

2010-12-04 Thread Bruno Wolff III
On Fri, Dec 03, 2010 at 16:34:05 -0800, Jesse Keating 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

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Andreas Schwab
Jesse Keating 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. -- Andreas S

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Jesse Keating
On 12/03/2010 09:33 PM, Garrett Holmstrom wrote: > On 12/3/2010 18:34, Jesse Keating wrote: >> The original thought was to have top level branches that are named after >> distribution releases, eg "f14", "f15", "el5". Then we would force >> branches of those branches use a naming structure of "f14

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Jesse Keating
On 12/04/2010 02:19 AM, Matej Cepl wrote: > Dne 4.12.2010 06:33, Garrett Holmstrom napsal(a): >> Why tie branch names down to specific releases? While that scheme makes >> it easy for fedpkg to guess what release to attempt to build against >> when one only cares about one release, it makes litt

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Jesse Keating
On 12/04/2010 02:31 AM, Kalev Lember wrote: > On 12/04/2010 12:19 PM, Matej Cepl wrote: >> Related issue I have with the Fedora git repositories is that one cannot >> remove any branch once it is created. After I have created in bitlbee >> repo two topic branches, only to find out that I cannot rem

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Jesse Keating
On 12/04/2010 07:24 AM, Severin Gehwolf wrote: >> Also we would need to get a new fedpkg into the hands of all the >> > developers that handles the new branchnames. We could do a build >> > that >> > handles both the oldnames and the new and have it out and available >> > for >> > a reasonable per

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Jesse Keating
On 12/04/2010 09:52 AM, Bruno Wolff III wrote: > On Fri, Dec 03, 2010 at 16:34:05 -0800, > Jesse Keating 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

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Bruno Wolff III
On Mon, Dec 06, 2010 at 12:33:40 -0800, Jesse Keating 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

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Jesse Keating
On 12/06/2010 01:10 AM, Andreas Schwab wrote: > Jesse Keating 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. >

Re: Request for comment: Potential change to dist-git branch structure

2010-12-06 Thread Jesse Keating
On 12/06/2010 12:44 PM, Bruno Wolff III wrote: > On Mon, Dec 06, 2010 at 12:33:40 -0800, > Jesse Keating 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? >> >>

Re: Request for comment: Potential change to dist-git branch structure

2010-12-08 Thread Jesse Keating
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Ā² i