dot

packages and services management
Log | Files | Refs | README

commit acf840d1efa154ae0640c3497fa41bb3013c6724
parent 9df6b14429229d6c5ead6e41a8f9b8f4e769b9f6
Author: josuah <mail@josuah.net>
Date:   Thu, 17 Nov 2016 01:06:48 -0500

Added new logic branch

Diffstat:
Mbin/version | 33++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/bin/version b/bin/version @@ -210,24 +210,27 @@ merge() 2 ) local source="$tree2" destination="$tree1" ;; esac + # if only one of the two version, then immediately import the + # other one, that's it + # get the history of change of the source file trace "$source/$DIR/$revision" "$md5" "$path" | action - # for this entry, look the similar version in the other tree - #IFS='- :' read -r sum path - ls "$tree/$DIR" | # for all revisions - sort -r | - xargs grep -h "$sum $path" "$tree/$DIR" | - head -n 1 | - { - read -r sum file - } - - # since this revision look for what happen in history - ( - cd "$tree" - history "${revision##*-}" - ) +# # for this entry, look the similar version in the other tree +# #IFS='- :' read -r sum path +# ls "$tree/$DIR" | # for all revisions +# sort -r | +# xargs grep -h "$sum $path" "$tree/$DIR" | +# head -n 1 | +# { +# read -r sum file +# } +# +# # since this revision look for what happen in history +# ( +# cd "$tree" +# history "${revision##*-}" +# ) done }