Suppose I have a local file that I am working on that is part of a repository. The local file has changes that are local and have been saved to the local file and have yet to be committed. What happens when I go to update the whole repository?
Is it the case that SVN will try and merge the HEAD with the local copy (hopefully sans conflicts) or will SVN just leave the local copy alone until it is committed later?
The svn update command never discards or removes local changes made in your working copy.
svn update brings changes from the repository into your working copy. If no revision is given, it brings your working copy up to date with the HEAD revision. Otherwise, it synchronizes the working copy to the revision given by the --revision ( -r ) option.
If you want to undo all changes you made in a file since the last update you need to select the file, right click to pop up the context menu and then select the command TortoiseSVN → Revert A dialog will pop up showing you the files that you've changed and can revert.
TortoiseSVN makes sure that all files/folders which are from the same repository are updated to the exact same revision! Even if between those updates another commit occurred.
It will merge HEAD with your local copy. If the changes collide - you get a nice conflict.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With