Searched hist:200708 (Results 1 - 1 of 1) sorted by relevance
| /freebsd-9.3-release/usr.sbin/mergemaster/ | ||
| H A D | mergemaster.sh | diff 200708 Sat Dec 19 03:31:12 MST 2009 dougb Fix a problem with how mergemaster handles the hard links for /.cshrc and /.profile. The problem is that install(1) will unlink the old file before it installs the new one, which means that in the best case we have to compare the changes for the old file twice. So, change the logic to first test to see if the link exists, then install the file. Then if the link was there and we're using -i, just create the link in /root and be done with it. Otherwise display the message to the user and give them the option. Because we are now sorting things before doing the comparison we can know conclusively that the files in / should be the sources, and the files in /root will be the targets, so adjust the paths accordingly. While I'm here, split a too-long error message into two lines and just return at the end of handling these files instead of setting the variable that says "do nothing" and then returning at the end of the function anyway. |
Completed in 73 milliseconds