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 196226 - org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files: nbproject/build-impl.xml nbproject/genfiles.properties
Summary: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with fil...
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.0
Hardware: All All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-03-03 12:31 UTC by Ondrej Vrabec
Modified: 2011-03-04 05:46 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Exception Reporter: 177206

Attachments
stacktrace (3.43 KB, text/plain)
2011-03-03 12:31 UTC, Ondrej Vrabec 		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 Ondrej Vrabec 2011-03-03 12:31:03 UTC 
Build: NetBeans IDE Dev (Build 110223-b9adc411a3e1)
VM: Java HotSpot(TM) 64-Bit Server VM, 19.1-b02, Java(TM) SE Runtime Environment, 1.6.0_24-b07
OS: Linux

User Comments:
ovrabec: Merging a branch into HEAD, WT contains modified files




Stacktrace: 
org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files: 
nbproject/build-impl.xml
nbproject/genfiles.properties
   at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:392)
   at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:183)
   at org.netbeans.libs.git.jgit.commands.MergeCommand.run(MergeCommand.java:89)
   at org.netbeans.libs.git.jgit.commands.GitCommand.execute(GitCommand.java:70)
   at org.netbeans.libs.git.jgit.JGitClient.merge(JGitClient.java:360)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(NativeMethodAccessorImpl.java:0)
Comment 1 Ondrej Vrabec 2011-03-03 12:31:08 UTC 
Created attachment 106647 [details]
stacktrace
Comment 2 Ondrej Vrabec 2011-03-03 15:03:23 UTC 
fix: http://hg.netbeans.org/core-main/rev/f3b569b769b9
Comment 3 Quality Engineering 2011-03-04 05:46:16 UTC 
Integrated into 'main-golden', will be available in build *201103040000* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main/rev/f3b569b769b9
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Issue #196226 - org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:  nbproject/build-impl.xml nbproject/genfiles.properties