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 245078

Summary: Add "Sync with tracked branch" to popup in the repository browser
Product: versioncontrol Reporter: Ondrej Vrabec <ovrabec>
Component: GitAssignee: Ondrej Vrabec <ovrabec>
Status: RESOLVED FIXED    
Severity: normal CC: apireviews, git
Priority: P3 Keywords: API, API_REVIEW_FAST
Version: 8.0   
Hardware: PC   
OS: Linux   
Issue Type: ENHANCEMENT Exception Reporter:
Bug Depends on:    
Bug Blocks: 244707    
Attachments: API change

Description Ondrej Vrabec 2014-06-16 09:55:38 UTC 
A branch tracking a remote branch (e.g. master tracking origin/master etc.) should have an action "Sync with Tracked" that merges the tracked branch (origin/master) into the branch (master).
In other words if a fetch/pull brings changes from a remote repository the action would bring the changes also to the local branch without a need to make a checkout and merge. Of course this applies only if it ends with a FF merge (i.e. the local branch does not have any unpushed commits).
Comment 1 Ondrej Vrabec 2014-06-19 07:15:29 UTC 
Created attachment 147722 [details]
API change
Comment 2 Ondrej Vrabec 2014-06-19 07:15:41 UTC 
need an API upgrade..., please review.
Comment 3 Ondrej Vrabec 2014-06-23 10:03:05 UTC 
fix: http://hg.netbeans.org/core-main/rev/37093c126e19
Comment 4 Quality Engineering 2014-06-24 02:41:29 UTC 
Integrated into 'main-silver', will be available in build *201406240001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/37093c126e19
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #245078 - Add "Sync with tracked branch" to popup in the repository browser
the action moves the branch's head to the new commit if it is a ff merge.