scripts/rev_control/resolve_svn.sh

   1 #!/bin/bash
   2
   3 # resolves a tree conflict by accepting the "working" version,
   4 # which effectively makes your current change the accepted one.
   5
   6 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
   7 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
   8
   9 save_terminal_title
  10
  11 ##############
  12
  13 filename="$1"; shift
  14
  15 if [ -z "$filename" ]; then
  16   echo "This script needs a filename to operate on."
  17   exit 1
  18 fi
  19
  20 svn resolve --accept=working "$filename"
  21 exit_on_error "resolving tree conflict by accepting the working directory as the right one"
  22
  23 restore_terminal_title
  24