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.
| Summary: | Eliminate merges by better Commit dialog UI | ||
|---|---|---|---|
| Product: | versioncontrol | Reporter: | Jaroslav Tulach <jtulach> |
| Component: | Mercurial | Assignee: | Ondrej Vrabec <ovrabec> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | iainhallam |
| Priority: | P3 | Keywords: | PLAN |
| Version: | 7.1 | ||
| Hardware: | Other | ||
| OS: | Linux | ||
| Issue Type: | ENHANCEMENT | Exception Reporter: | |
|
Description
Jaroslav Tulach
2011-10-13 12:54:54 UTC
And what about a user has already committed something before (there are upstream and local commits)? Than you don't want to do pull because you'll get two heads and will be forced to do either merge or rebase manually. In that case i suggest there's no warning. fixed: core-main #5286e95d50ed However i don't think it will help and be of any use to NB developers because just to determine if there are any incoming changes and a warning should be displayed now takes about a minute. By that time the developer will have committed his work, maybe even twice. Integrated into 'main-golden', will be available in build *201303222300* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/5286e95d50ed User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #203650 - Eliminate merges by better Commit dialog UI displaying a warning message when there are incoming changes to be pulled from a remote repository |