[P4] solve the conflict between local file modification and library file

Click to enter 【 Chip design verification 】 Community , See more

---

  Statement ：

• 🥭 Author URI ：【MangoPapa Of CSDN Home page 】.
• ️ This article was first published in CSDN, Please indicate the source of reprint or quotation https://mangopapa.blog.csdn.net/article/details/125939590.
• ️ This paper is non-profit , The purpose is Personal learning record And Knowledge sharing . Limited by personal ability , There is a possibility of incorrect interpretation of the agreement . If you refer to this article for product design or other matters and cause adverse consequences , I will not bear relevant legal liabilities .
• ️ If the pictures or relevant references used in this article infringe upon your legitimate rights and interests , Please contact me to delete .
• Welcome to point out the mistakes in the article , Welcome colleagues to communicate with me ~
• mailbox ：[email protected]

---

introduction

This column records some commonly used Command combination or Script . Scripts include but are not limited to shell、python、perl.
This article is 《【P4】 Solve the conflict between local file modification and library file 》.
More practical scripts Click to view the general directory .

---

Demand is raised

   Adopted by the company perforce Conduct code version management , The same team is in the same branch Work under the . Many people put code check out To local ,edit Later submit Upload to the Library . if A and B For the same file F the edit,A Precede B take file F Upload , stay B Upload time , There will be a problem that the local modification conflicts with the version of the library file .

   The common method is p4 resolve Change yourself with others merge together .p4 resolve Of merge Parameters are shown in table 1 Shown .

▼ surface 1：p4 resolve Of megre Related parameters

Parameters	paraphrase
-am	Who's with base Who does not agree to accept , If both of them are base atypism , If two people change without conflict, it will automatically merge, The conflict between the two changes is ignored .
-as	Who's with base Who does not agree to accept , If both of them are base atypism , Ignore whether it conflicts or not .
-ay	Accept our changes .
-at	Accept the changes of others .

   In most cases , The changes of the two people will conflict , We need to manually change our changes with others in the Library merge together . At this time, a series of operations are needed to complete manual merge. Consider every manual merge It's all a few commands , Just seal it .

---

Script features

• Generate a local backup of the original file , Add a timestamp to the original file name as the backup file name .
• The original document revert and sync To the latest version , Align with the library version .
• resolve After the completion of ,CL Still with resolve Before CL identical .
• need p4 diff Manual merge.

---

Script

   The script is called m_resolve.sh, For convenience, please use ~/.bashrc in alias m_resolve 'sh ~/script/m_resolve.sh'.

#！ /usr/bin/sh

# File Name: m_resolve.sh
# Usage : sh m_resolve.sh conflicted_file

timestamp=$(data +%Y%m%d%H%M%S)
ori_file=$1
bak_file=.$ori_file.$timestamp

# get CL
CL=`p4 opened $ori_file`
CL=`echo ${
     CL#*\edit change}`  # keep right
CL=`echo ${
     CL%% *}`                # keep left

#
cp $ori_file $bak_file
p4 revert $ori_file
p4 sync $ori_file
p4 edit $ori_file
cp $bak_file $ori_file
p4 reopen -c $CL $ori_file
p4 diff $ori_file

---