My colleague has changed a bunch of files in a specific branch (let's call it b1). He has shared with me the changelist ID.
I want to copy all those changes to another branch (b2) which is locally copied to my machine as well.
How can I achieve the same using Perforce?
Type this into a command prompt:
p4 integrate b1/...#CHANGE,CHANGE b2/...
p4 resolve
p4 submit
Source: https://www.perforce.com/perforce/doc.current/manuals/cmdref/
make sure both b1 and b2 are defined in your workspace
Right-click on the changelist from the Submitted Changelists view and select "Merge/Integrate using Selected Changelist nnnn"
From the Merge/Integrate view, if you don't already have a defined Branch Map (that's recommended if you will be doing this often), choose "Specify source and target files" and choose b1 as your source and b2 as your target.
Fill out the rest as you prefer and resolve (if necessary)
Details Merging Files Between Codelines
Related
I need to get a diff between two commits in GitLab. I've read the instructions for doing that, but they aren't consistent with GitLab's diff form.
I have to specify the name of the "to" project (the "from" project is pegged to the current project) and the "from" and "to" commits. But when I select Repository > Compare I get this:
The form prompts me for the name of the "to" project and "from" and "to" branches. There's no place to select the "from" and "to" commits!
Could I have displayed a form that's just for comparing the latest commits of different branches, even though I followed instructions for comparing different commits of the selected branch? I don't think so; the last button is labeled "Swap revisions," not "Swap branches." The form thinks it's inviting me to select two commits, but doesn't let me do it.
I tried entering commit IDs in the "branch" fields. GitLab won't let me. The fields are dropdowns. They let me enter a value, but it's just a filter for a list of branch names; when I enter a commit ID GitLab finds no matching branches and I can't select anything.
How is this supposed to work?
It is a bit confusing, but in the dropdown there is a field that you can use to filter your branch. In that field, you can enter the SHA of the commit, and press enter. In this way, you can compare commits
As it says on the tin, is it possible for me to find who has approved the most merge request in Git please? Thanks!
There are two ways, depending on whether you want to know based on a group or a project:
For a group, you select "Analytics > Contribution" and scroll down to "Contributions per Group Member", where you can sort by Approved MR count
For a project, you select "Merge Requests", then click the "Merged" tab and export it to CSV using the button in the upper right. Then you can open the CSV and create a chart using something like excel.
I have a data → The data contains such as Name, email, Phone etc.
The files are divided into folders based on countries such as →
Australia
New Zealand
USA
UK
Ireland and all other Countries.
In this country Folder, a file is kept, which is normally of the sort 1.csv that means the name is same in all the folders 1.csv in USA, Canada, Australia or perhaps any other country, for example.
See this Video → http://screencast.com/t/rwuE9RoXD.
Operation 1→ Change the name of the file, which is CSV or excel sort of format to country format such. Precisely this image → http://screencast.com/t/XUgqNx3U, but I have to make it in such a manner that it can handle any extension in excel. For example, in Australia folder, the "1.csv or 1.excel" should be changed to australia_1.csv and in zimbabwe folder, it should be changed to zimbabwe_1.csv. Similarly for other countries. Then collect these modified names extension in one folder named common. Got It?
Operation 2 → Combine all the modified Files into one big File. I am showing you structure of the sample 1.csv file see this video → http://screencast.com/t/O1dJmeRJALDZ. We will need 3 columns to be combined = Domain Name, Full Name, and Email. While doing this combination it will be advisable If 4th column can be created which will have entry like from where the entry is coming such as Australia_1, Zimbabwe_1
Operation 3 → Concatenation result in a new column like this →
Full Name<Email> = James Bond <james.bond#gmail.com>
, for example that means name and email concatenated in the above format that I showed you.
All three steps are doable through some command in window or excel?
I think I have found the answer and I am writing the answer to my own question so that someone may find it helpful.
The solution for Operation 1 → As suggested by ti7 this software Métamorphose can help rename the files in a subfolder(or Perhaps the main folder).
If you want to move the contents of a source directory and all of its sub-directories to a single destination directory (i.e. flatten the folder structure), it's very easy and you don't even need to bother with the command line.
Just go to the top-level source folder (whose contents you want to copy), and in the Windows Explorer search box type * (just a star or asterisk). This will display every file and sub-folder under the source folder. Now just sort by Type to group all files together, select them all, then cut/copy and paste in the destination dir.
If you have hidden and system files as well, under Organize → Folder and search options → View tab make sure Show hidden files... is selected, and Hide protected operating system files is unchecked. citation
Solution for Operation 2 →
If the column structure is same then this software can help in the combination or merger.
Solution for Operation 3 → This Video will help Concatenate.
Can autocrat be set up to use a column heading to name the document when it is merged. I have a form that creates student information and final grades in a spreadsheet and I use autocrat to merge data from the spreadsheet to a google doc., but each document merged has the same name unless I change it in the merge process or after the merge is complete. It seems if we could use <<Student>> in the "File naming convention to use" in the Set merge type step this would solve the problem.
If I got it right, you just have to use the proper tag at the fifth step of autocrat configuration. It'll probably be something like $student.
I'm a TFS2010 User.
I have my own query named "My Current job" that show me the User Stories and related Task that I have to do right now.
I have opened the query in excel and made a conditional format to the workbook that show in green color the rows of completed work items.
Are there any way to make this conditional format (and other changes like this) permanent for this query?
I'm not the only one user of the teamproject, so I preffer don't change anything that could affect others users unless that is the only way.
Currently I've excel macros that do the job, but I wonder if it can be done directly in TFS .
Thanks.
This should be possible by using the "Team" ribbon on any Excel-document, simply click on any cell and then select "New List". Navigate to the query you 're interested in and harvest the results in your worksheet:Once you have established this link "Publish" will push your changes from Excel to TFS and "Refresh" will refresh your results from TFS