how to compare two files?
The file name is same. One is in unresolved folder, and another one is in an incoming folder.
Thanks, Jiangfan |
9 answers
The file name is same. One is in unresolved folder, and another one is in an incoming folder. In pending changes double click on one of the file (does not matter if the one from incoming or outgoing). Does it help for you? |
|
It does not help. Let's say the original version in local machine is A, and A' is the one in the unsolved folder and A'' is the one in the incoming folder. I double click on both files, which shows the comparison (A',A) and (A'',A). There is no comparison between (A'',A').
Then I tried to check in A' to an outgoing folder, and double click it. There result is no change. There is no a comparison between (A'',A'). Any suggestions or this is just the way it is in RTC. Best, Jiangfan The file name is same. One is in unresolved folder, and another one is in an incoming folder. In pending changes double click on one of the file (does not matter if the one from incoming or outgoing). Does it help for you? |
It does not help. Let's say the original version in local machine is A, and A' is the one in the unsolved folder and A'' is the one in the incoming folder. I double click on both files, which shows the comparison (A',A) and (A'',A). There is no comparison between (A'',A'). The file name is same. One is in unresolved folder, and another one is in an incoming folder. In pending changes double click on one of the file (does not matter if the one from incoming or outgoing). Does it help for you? Did you try to single click on A' and ctrl + right click on A'' and choose from menu "compare with each other"? I think it should help :) |
|
I tried the ctrl to choose A' and A'', and right click them, there is no menu "compare each other". There is a menu "Open in Compare Editor" which seems to compare A'' and A.
By the way I am using Jazz in Visual Studio 2005. I am not sure if that is the reason. Or Jazz does not have such comparison function. Thanks. Jiangfan It does not help. Let's say the original version in local machine is A, and A' is the one in the unsolved folder and A'' is the one in the incoming folder. I double click on both files, which shows the comparison (A',A) and (A'',A). There is no comparison between (A'',A'). The file name is same. One is in unresolved folder, and another one is in an incoming folder. In pending changes double click on one of the file (does not matter if the one from incoming or outgoing). Does it help for you? Did you try to single click on A' and ctrl + right click on A'' and choose from menu "compare with each other"? I think it should help :) |
I tried the ctrl to choose A' and A'', and right click them, there is no menu "compare each other". There is a menu "Open in Compare Editor" which seems to compare A'' and A. It does not help. Let's say the original version in local machine is A, and A' is the one in the unsolved folder and A'' is the one in the incoming folder. I double click on both files, which shows the comparison (A',A) and (A'',A). There is no comparison between (A'',A'). The file name is same. One is in unresolved folder, and another one is in an incoming folder. In pending changes double click on one of the file (does not matter if the one from incoming or outgoing). Does it help for you? Did you try to single click on A' and ctrl + right click on A'' and choose from menu "compare with each other"? I think it should help :) Hi, I do not know what your usecase is, but do you not want to accept the incoming changes? Because if you do, then it becomes a simple comparison between your local version and the accepted one. As a developer, I would typically accept all incoming changes, since my changes should conform to the new state of the file, or rather the latest state of the stream. So if there is an incoming change, and I am also changing the same file, I need to merge my changes to the incoming ones. This is how comparison is done: * A Compare on unresolved file - compares local unchecked-in file with that in repository workspace * A Compare on checked-in file - Compares it with the previous state in the repository workspace * A Compare on incoming file - This change is not there in our repository workspace yet (hence incoming). So this is compared with the previous state in the repository. |
|
This functionality is not currently present in Visual studio client.
I have created an enhancement request for the same. https://jazzdev.torolab.ibm.com:9443/jazz/resource/itemName/com.ibm.team.workitem.WorkItem/126285 Prabodh |
We are using the If we use the context menu option But, the Cheers. |
RTC 3.0 client installed as a plugin to VS 2010 shows many a times java.lang.OutofMemoryError . How to resolve this ?
|
RTC 3.0 client installed as a plugin to VS 2010 shows many a times java.lang.OutofMemoryError . How to resolve this ? Do you get OOM for some specific operation? Does it happen when VS is idle, or when some operation is being performed? Can you please attach the logs when you encounter this issue next. |
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.