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 207163 - Can't delete not fully merged GIT branch
Summary: Can't delete not fully merged GIT branch
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.1
Hardware: PC Windows Vista
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
: 207517 (view as bug list)
Depends on:
Blocks:
 
Reported: 2012-01-11 10:27 UTC by tskorka
Modified: 2012-02-28 12:23 UTC (History)
3 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Dialog which is repeated forever (19.62 KB, image/jpeg)
2012-01-11 10:27 UTC, tskorka 		Details
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 tskorka 2012-01-11 10:27:56 UTC 
Created attachment 114786 [details]
Dialog which is repeated forever

When I try to delete a not fully merget GIT branch (following instructions given at http://netbeans.org/kb/docs/ide/git.html#branchDelete ), Netbeans pops up following dialogs:
1. Do you really want to delete........ -> Click OK
2. Branch XYZ has not been fully merged yet. Do you still want to delete this branch -> Click 'Yes'

Despite of selecting 'Yes' in dialog #2, it is shown again and again and branch is not being deleted.
Comment 1 Ondrej Vrabec 2012-01-12 09:24:06 UTC 
fix: http://hg.netbeans.org/core-main/rev/5f3faccc397e
Comment 2 Quality Engineering 2012-01-13 21:52:07 UTC 
Integrated into 'main-golden'
Changeset: http://hg.netbeans.org/main-golden/rev/5f3faccc397e
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #207163 - Can't delete not fully merged GIT branch
Comment 3 Ondrej Vrabec 2012-01-19 14:00:35 UTC 
*** Bug 207517 has been marked as a duplicate of this bug. ***
Comment 4 Stepan Zebra 2012-02-08 16:15:34 UTC 
verified in trunk
Comment 5 Ondrej Vrabec 2012-02-08 16:22:57 UTC 
7.1.1 http://hg.netbeans.org/releases/rev/af0e873f8c19
Comment 6 Quality Engineering 2012-02-09 02:38:43 UTC 
Integrated into 'releases', will be available in build *201202082200* or newer. Wait for official and publicly available build.
Changeset: http://hg.netbeans.org/releases/rev/af0e873f8c19
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #207163 - Can't delete not fully merged GIT branch
(transplanted from 5f3faccc397e29ce6790849990d23417eaeb8de2)
Comment 7 Stepan Zebra 2012-02-28 12:23:02 UTC 
verified in 7.1.1