Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 341062 - URIIsh normalization caues PullCommandTest.testPullMerge to fail on Windows
Summary: URIIsh normalization caues PullCommandTest.testPullMerge to fail on Windows
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows Server 2003
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-03-27 15:23 EDT by Robin Rosenberg CLA
Modified: 2011-04-03 18:55 EDT (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Robin Rosenberg CLA 2011-03-27 15:23:08 EDT
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.
Comment 1 Robin Rosenberg CLA 2011-04-01 04:05:59 EDT
Patch posted at http://egit.eclipse.org/r/#change,2943
Comment 2 Matthias Sohn CLA 2011-04-03 18:55:14 EDT
merged as 7c7a00edc264b70fca18254351568ce34bfe2bc1