Don't update ChangeLog.linaro to avoid integration conflicts.

ChangeLog contributions are in ChangeLog.frag files.

1 files changed, 6 insertions, 9 deletions

diff --git a/backflip b/backflip
index 31cb120..62438f3 100755
--- a/backflip
+++ b/backflip
@@ -52,19 +52,20 @@ ask() {
 
 # arg1 : svn rev number
 # arg2 : ChangeLog file
-# Create ChangeLog entry for arg1 in arg2.bcp
+# Create ChangeLog entry for arg1 in arg2.frag
 forge_entry() {
-  echo -e $DATE"  "$NAME"  <"$EMAIL">\n\n\tBackport from trunk r"$1"." >> $2.bcp
+  echo -e $DATE"  "$NAME"  <"$EMAIL">\n\n\tBackport from trunk r"$1"." >> $2.frag
   git show --format=oneline ${SHA1} -- $2 \
     | grep ^+ \
     | sed -e '1d' -e 's:^+::' \
-    | awk '$1 ~ /^2.*$/ {print "\t"$0}  $1 !~ /^2.*$/ {print $0}' >> $2.bcp
+    | awk '$1 ~ /^2.*$/ {print "\t"$0}  $1 !~ /^2.*$/ {print $0}' >> $2.frag
   print_info "${bold}Forged ChangeLog entry:${NC}"
-  cat $2.bcp
+  cat $2.frag
   ask "${bold}Edit ChangeLog entry [N/y] ?" user_edit
   if [ "$user_edit" == "y" ]; then
-    "$EDITOR" $2.bcp
+    "$EDITOR" $2.frag
   fi
+  git add $2.frag
 }
 
 # ==============================================================================
@@ -111,10 +112,6 @@ for i in $CHLOGS; do
   git checkout $i
   # Create ChangeLog entry
   forge_entry $1 $i
-  # Add it in Linaro ChangeLog
-  cat $i.linaro >> $i.bcp
-  mv $i.bcp $i.linaro
-  git add $i.linaro
 done
 
 # ==============================================================================