Question regarding showing differences between branches.

aaron_smith · Post by **aaron_smith** » Mon Apr 30, 2007 2:11 pm

We have a pretty simple branch setup. I'm not sure I did it right though...

What we have is:
Project-A-Dev
Project-A-Prod

They are essentially the same project, except the -Prod always is the program our customers have, while -Dev is our working source code. Whenever I send out an update to our customers, I merge the branches so that they should be exactly the same at that moment in time.

I just did this again, and for the second time, if I do a Show Differences between the -Dev and -Prod, it will show approximately 20 - 30 (of around 500) files being different. However, if I view the Diff, it says the files are identical... This is with and without the ignore case and whitespace.

What could the problem be?
Thanks,
Aaron

Beth · Post by **Beth** » Tue May 01, 2007 2:09 pm

There are three things that are ignored in the individual file diff that are seen in a folder diff. These are end-of-line characters, white space, and line feeds. It could be one of the other two besides white space are present.

I think if you open both files in a different editor such as notepad that you should be able to see the difference there. Check that out, and if it's still not present, let me know.