On 22/12/2015 18:26, KI7MT wrote: > Other Items: > I have not implemented 'svn sw' yet, as it performs an update when > switching between branches, which I am not sure is a desired artifact > and would need to be manages closely when errors / user interrupts occur.
Hi Greg, automating 'svn sw' could be done by having the '-n ' option do it with the assumption that any switch would have an implied update. This is a complex area, as is 'svn up' in general because modified files are not updated. This could be useful e.g. to test a change on another branch, or a PITA if the developer did not realize a files was modified therefore not building what they expected. Either way it is difficult to know what the developer really wanted. This area is one of the motivations for git since it does the correct merge when changing branches with local changes. Subversion and most other SCS suffer from having branches added at some stage of their development whereas with git branches are fundamental and correctly supported from the start including the stash that allows changes to be shelved when it is needed to do a clean switch to another branch for a short while. This SO question illustrates the near impossibility of using 'svn sw' cleanly with changes in the workspace. http://stackoverflow.com/questions/1554278/temporarily-put-away-uncommited-changes-in-subversion-a-la-git-stash Compared with the trivial 'git stash ; git checkout <branch>; /* do work and commit */; git checkout <original>; git stash pop'. This is why I use git-svn for WSJT-X work rather than struggling with raw svn commands. 73 Bill G4WJS. 73 Bill G4WJS. ------------------------------------------------------------------------------ _______________________________________________ wsjt-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/wsjt-devel
