This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 177437 - Permit named branches in contrib
Summary: Permit named branches in contrib
Status: RESOLVED FIXED
Alias: None
Product: www
Classification: Unclassified
Component: Builds & Repositories (show other bugs)
Version: 6.x
Hardware: All All
: P2 normal (vote)
Assignee: rnovak
URL: http://hg.netbeans.org/release68/cont...
Keywords:
Depends on:
Blocks:
 
Reported: 2009-11-23 07:35 UTC by Jesse Glick
Modified: 2010-03-18 16:55 UTC (History)
6 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jesse Glick 2009-11-23 07:35:08 UTC 
We should be branching contrib for release68, as we have done for former releases. Since this seems to have been neglected when tagging main, I have just added a release68_base tag in main/contrib (aligned by date with that in main) to serve as the clone point; just need to

hg clone -r release68_base main/contrib release68/contrib
hg -R release68/contrib tag -r ffc037f6e9b2 release68_base

and set up permissions in the usual way (copied from main/contrib I suppose).


BTW I don't see any way to manage repos myself at

http://netbeans.org/projects/ide/sources

but maybe that is just a permissions issue.
Comment 1 Jesse Glick 2009-11-25 09:59:36 UTC 
Never mind, I'll just make a named branch.
Comment 2 Jesse Glick 2009-11-25 10:07:57 UTC 
Cannot push a release68 branch currently because:

added 1 changesets with 1 changes to 1 files (+1 heads)
Trying to push more than one head, try run "hg merge" before it.
transaction abort!
rollback completed
abort: pretxnchangegroup.forbid_2heads hook failed

Please change forbid_2head.py to only enforce one head per named branch, or simply disable it for this repo.
Comment 3 fommil 2009-12-31 03:08:44 UTC 
Can't you just use a workaround like what you did for release67?

Basically, I'd just like a contrib/release68 so that I can provide javahints static import hints to 6.8 (should be in 6.9).
Comment 4 Jesse Glick 2010-01-08 17:14:08 UTC 
Michal, Robert, anyone? forbid_2heads needs to be fixed to permit multiple heads so long as they are on different named branches. This hook could then be used on any repo, incl. prototypes. I could come up with a patched version if you want but I cannot install it.

Or the hook could just be disabled for the time being; it was mainly useful when there were a lot of Hg novices who did not understand they needed to merge before pushing. No permanent harm is done by pushing an unmerged head - can be fixed by anyone else just by doing the merge and pushing it. However it would be nice to have a fixed hook enabled; it could be useful for the round-robin scripts.
Comment 5 Jesse Glick 2010-02-24 14:10:25 UTC 
A fixed version of forbid_2heads has been deployed and there is now a release68 branch in the main/contrib repo.
Comment 6 Michel Graciano 2010-03-18 16:26:32 UTC 
Could I take a look at this regression or is there already someone looking for this? BTW, thanks for rollback this in time.
Comment 7 Michel Graciano 2010-03-18 16:55:45 UTC 
Please just forget about my last comment, I swear I posted this at another issue :( Sorry for this.