Classpath file contains absolute paths & causes conflicts

Issue #466 resolved
Robert Leach created an issue

USE CASE: WHAT DO YOU WANT TO DO?

Push and pull without conflicts involving the .classpath file.

STEPS TO REPRODUCE AN ISSUE (OR TRIGGER A NEW FEATURE)

  1. Pull from the master branch or push any change from any branch

CURRENT BEHAVIOR

After the recent updates using Gradle, pulling, pushing, & "replacing" (see next paragraph) changes has become problematic due to conflicts involving the .classpath file containing absolute paths that include each developer's home directory.

Whether you're on a branch or not, when you replace with the head revision, you end up with classpath conflicts, however the conflicts are not handled by the merge tool. You have to manually find each broken dependency. Here's a screen-cap of where you can find the issues:

build_problem_after_replacing_with_head.png

You have to double-click each one and find the jar file that its looking for.

EXPECTED BEHAVIOR

The .classpath file should not cause conflicts on every pull/push/replace(with head).

DEVELOPERS ONLY SECTION

SUGGESTED CHANGE (Pseudocode optional)

Relative paths. Current work-arounds: Pull: delete repository & replace with remote head of master. Push: uncheck the .classpath file upon pushing.

FILES AFFECTED (where the changes will be implemented) - developers only

.classpath possible gradle config file change

LEVEL OF EFFORT - developers only

medium

COMMENTS

Comments (5)

  1. Log in to comment