Community
Participate
Working Groups
Expected: Merge branch 'master' of D:\rorowork\egit\jgit\org.eclipse.jgit.test\target\trash\test1301252966786_2 Actual:Merge branch 'master' of D:/rorowork/egit/jgit/org.eclipse.jgit.test/target/trash/test1301252966786_2 at org.eclipse.jgit.api.PullCommandTest.testPullMerge(PullCommandTest.java:141) This can be traced back to 435874710 where I made the decision to normalize URI:s. In comparison C Git preserves the backslash in this situation, which means the assertion is correct. Windows, at the API level, doesn't care whether we use backward or forward slashes, so that is not an issue. The simple fix to to change the assertion, but that might not be the correct fix.
Patch posted at http://egit.eclipse.org/r/#change,2943
merged as 7c7a00edc264b70fca18254351568ce34bfe2bc1