|
|
| Re: Diff between a current state of a file and the commited version [message #758567 is a reply to message #758519] |
Wed, 23 November 2011 17:34   |
|
Quote:It seems that view Team/Synchronize compare only with the file on the server.
Oodini, what do you mean by "compare only with the file on the server" ?
Quote:You want "Team -> Synchronize Workspace" in this case, not "Team -> Advanced-> Synchronize". The first one compares your working directory to the Index. The second one compares the active branch to some other reference. You get the advanced version if run the "Synchronize..." toolbar item.
Actually "Team -> Synchronize workspace" will compare yours local working copy with HEAD version (not against git index). In "Workspace" presentation model all changes that are in git index and in yours working copy will be squash together, if you will switch to "Git Commits" model changes will be spited into "<working tree>" and "<staged changes>".
Same rules apply to "Team -> Advance -> Synchronize" with a slightly difference. In this case you can also see changes from other commits that are in one branch but not in the other one. Also "Workspace" presentation model will squash all changes together, but "Git Commits" model will show additional commit nodes for each commit and will present changes introduced by this commit inside this node.
|
|
|
|
| Re: Diff between a current state of a file and the commited version [message #758607 is a reply to message #758596] |
Wed, 23 November 2011 20:41 |
|
R Shapiro wrote on Wed, 23 November 2011 14:55I think we can take for granted that "compare with file on the server" means "compare with the version in the corresponding branch of the origin repository". This is the closest equivalent to what the SVN team providers do in this perspective.
Yes in deed, but from the context I understood that "comparing with remote branch" is not a desired result of synchronize action.
|
|
|
|
Powered by
FUDForum. Page generated in 0.02096 seconds
] 
Search
Help
Register
Login
Home
