Date: Sun, 20 Apr 2003 10:24:24 -0700 From: "Anton Zavrin" <antonzav@pacbell.net> To: <freebsd-stable@freebsd.org> Subject: mergemaster tips Message-ID: <003901c30761$b020fd40$0200a8c0@travel>
next in thread | raw e-mail | index | archive | help
Hi, give me some tips please, first of all, first screen: ============================================= *** The directory specified for the temporary root environment, /var/tmp/temproot, exists. This can be a security risk if untrusted users have access to the system. Use 'd' to delete the old /var/tmp/temproot and continue Use 't' to select a new temporary root directory Use 'e' to exit mergemaster Default is to use /var/tmp/temproot as is How should I deal with this? [Use the existing /var/tmp/temproot] ============================================== Should I "d" the old temproot or should I just hit "Enter"? Second thing, when I actually merging files, what I do is I hit "v" - variously include common lines and then I hit "m" to merge, primarily using "r" right side. By "verbosely include common lines" I only "Guess" that the mergemaster will include everything common from both files and then by using "r" switch I'm adding everything "fresh" from the new files (the files I just cvsuped), then I hit "q" to get out and then I hit "i" to install merged file. I do not need to edit any of my files during update, I just need to save what I have and add enw stuff. If you see my logic, please let me know if it's correct. Big Thanks ;-) Best Regards, Anton
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?003901c30761$b020fd40$0200a8c0>