tianyun 2 years ago
parent
commit
41469a32f2
3 changed files with 4 additions and 1 deletions
  1. 1 1
      .gitignore
  2. 2 0
      sh/git_cp_file.sh
  3. 1 0
      tmp.py

+ 1 - 1
.gitignore

@@ -2,4 +2,4 @@
 *.iml
 __pycache__
 .DS_Store
-/catboost_info/
+/catboost_info/

+ 2 - 0
sh/git_cp_file.sh

@@ -13,9 +13,11 @@ for file in $files; do
   # 判断文件是否存在于dev分支
   if git show ${dev_branch}:${file} &> /dev/null; then
     # 如果文件存在于dev分支,使用git checkout命令将文件从test分支复制到dev分支
+    echo "git checkout ${test_branch} ${file}"
     git checkout ${test_branch} ${file}
   else
     # 如果文件不存在于dev分支
+    echo "git show ${test_branch}:${file} > ${file}"
     git show ${test_branch}:${file} > ${file}
     git add ${file}
   fi

+ 1 - 0
tmp.py

@@ -14,6 +14,7 @@ with open(bookmarks_path, "r", encoding="utf-8") as f:
     bookmarks = json.load(f)
 
 
+# test
 # 提取书签的标题和网址
 def extract_bookmarks(bookmarks_dict, bookmarks_list):
     for item in bookmarks_dict["children"]: