cvs commit: src/usr.sbin/mergemaster mergemaster.sh

[Doug Barton]

dougb       2007-12-21 19:34:26 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  In the following scenario:
  1. Start mergemaster
  2. Interrupt it
  3. < Somehow the temproot directory disappears >
  4. mergemaster -r
  Many bad things can happen, especially if the -i option is in use.
  
  Therefore, add a check to make sure it still exists before we start
  comparing files.
  
  Brought to my attention by:
  PR:             bin/40538
  Submitted by:   Cyrille Lefevre <cyrille.lefevre at laposte.net>
  
  Revision  Changes    Path
  1.55      +7 -0      src/usr.sbin/mergemaster/mergemaster.sh