svn commit: r403829 - in head/devel: android-tools-adb android-tools-adb-devel android-tools-adb-devel/files android-tools-adb/files android-tools-fastboot-devel android-tools-fastboot-devel/files

[Jan Beich]

Jan Beich <jbeich at FreeBSD.org> writes:

> Added:
[...]
>   head/devel/android-tools-fastboot-devel/files/pkg-message.in   (contents, props changed)
>   head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp   (contents, props changed)
>   head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp   (contents, props changed)

Oops, the history is gone after not being careful with git-svn.

  $ cd devel/android-tools-fastboot-devel
  $ for f in pkg-message.in usb_freebsd.cpp util_freebsd.cpp; do 
      svn rm -q files/$f
      svn cp -q ../android-tools-fastboot/files/$f files/
    done

  $ svn st
  R  +    files/pkg-message.in
  R  +    files/usb_freebsd.cpp
  R  +    files/util_freebsd.cpp

  $ svn di | patch -REfsp0
  $ svn di
  <empty>

  $ svn ci -m 'devel/android-tools-fastboot-devel: restore history lost in r403829'
  Replacing      files/pkg-message.in
  Replacing      files/usb_freebsd.cpp
  Replacing      files/util_freebsd.cpp
  Transmitting file data .done
  Committing transaction...
  svn: E165001: Commit failed (details follow):
  svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output:
  Do not replace a file. This can lose history. Path: "/head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp"
  == Additional errors may compound and may not be accurate ==
  Do not replace a file. This can lose history. Path: "/head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp"
  Do not replace a file. This can lose history. Path: "/head/devel/android-tools-fastboot-devel/files/pkg-message.in"
  == Pre-commit problem count: 3

Alternatively

  $ cd devel/android-tools-fastboot-devel
  $ svn cp -q files at 403828 files.new
  $ for f in pkg-message.in usb_freebsd.cpp util_freebsd.cpp; do 
      svn cp -q ../android-tools-fastboot/files/$f files.new/
    done
  $ mv files/* files.new/
  $ svn rm -q files
  $ svn mv -q files.new files

  $ svn st
  R  +    files
  M  +    files/Makefile
  A  +    files/pkg-message.in
  A  +    files/usb_freebsd.cpp
  A  +    files/util_freebsd.cpp

  $ svn di
  <empty>
  
  $ svn ci -m 'devel/android-tools-fastboot-devel: restore history lost in r403829'
  Replacing      files
  Sending        files/Makefile
  Adding         files/pkg-message.in
  Adding         files/usb_freebsd.cpp
  Adding         files/util_freebsd.cpp
  Transmitting file data ..done
  Committing transaction...
  svn: E165001: Commit failed (details follow):
  svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output:
  Do not replace a file. This can lose history. Path: "/head/devel/android-tools-fastboot-devel/files"
  == Additional errors may compound and may not be accurate ==
  Do not replace a file. This can lose history. Path: "/head/devel/android-tools-fastboot-devel/files"
  == Pre-commit problem count: 2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 602 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20151216/6d1a93d0/attachment.sig>