Bazaar Plugin for Eclipse

Merge lp:~adrian-wilkins/bzr-eclipse/fix-folder-depth into lp:~verterok/bzr-eclipse/trunk

  1. fix-folder-depth
  2. Merge into trunk
Proposed by Adrian Wilkins
Status: Merged
Merged at revision: 221
Proposed branch: lp:~adrian-wilkins/bzr-eclipse/fix-folder-depth
Merge into: lp:~verterok/bzr-eclipse/trunk
Diff against target: 13 lines (+2/-1)
1 file modified
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/BzrWorkspaceRoot.java (+2/-1)
To merge this branch: bzr merge lp:~adrian-wilkins/bzr-eclipse/fix-folder-depth
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
Review via email: mp+45131@code.launchpad.net

Description of the change

Fixes the assumption that projects nested inside the branch are all 1 folder deep.

To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/BzrWorkspaceRoot.java'
2--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/BzrWorkspaceRoot.java 2008-08-31 19:19:34 +0000
3+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/BzrWorkspaceRoot.java 2011-01-04 15:42:12 +0000
4@@ -194,7 +194,8 @@
5 if(branchPath.segmentCount() == projectPath.segmentCount()) {
6 resource = branch.getProject().findMember(new Path(relativePath));
7 } else if(projectPath.segmentCount() > branchPath.segmentCount() ) {
8- resource = branch.getProject().findMember(new Path(relativePath).removeFirstSegments(1));
9+ int segdiff = projectPath.segmentCount() - branchPath.segmentCount();
10+ resource = branch.getProject().findMember(new Path(relativePath).removeFirstSegments(segdiff));
11 }
12 return resource;
13 }

Subscribers

People subscribed via source and target branches

to all changes: