When creating a code review via Crucible/Fisheye, I upload a patch file of local changes, generated using SVN's right-click context menu in windows (right click -> Create Patch), and successfully anchor it.
After this, some reviewers make comments and I agree to implement their changes, and so I do. I then create another patch file from my new set of local changes and upload it to the review, making sure to anchor it as well.
Now, when sliding the 'iterations' bar at the top of the review, there is no longer a way to compare changes relative to the checked-in 'baseline'. If the bar stretches from the original revision/baseline on the left to the first patch like so;
there are no changes shown in the diff view(s), almost as if the first patch uploaded has taken on the role of a new 'baseline'. The 2nd patch is always viewed in relation to the first patch, even if I stretch the iterations bar to start at the original, like so;
This looks identical to if I only compare the first patch and the second (without baseline) like so;
Why am I losing the ability to compare to baseline as soon as I upload the second patch? The diff is fine against baseline if I only upload the one patch file.
Related
After making changes to a tracked files in a Git repository, GitKraken allows you to view default hunks per file. You are given the option to Stage or Discard these hunks.
git add --patch provides the option to split hunks into smaller hunks. I am wondering whether this functionality exists within GitKraken and, if so, how to utilize it.
In Gitkraken's diff view you can stage/unstage/discard multiple lines by selecting them (click and drag over the lines, the text of the lines is now marked blue) and then right click to choose what you want to do.
For staging single lines there is also a green plus which appears next to the line when you hover your mouse over it.
Click on the green plus to stage the line.
This Gitkraken support site shows this in the following screenshot:
Eclipse shows me with the symbol > which files I have modified, after the last repository update. Before commiting, I want to see the changes I made.
When I go right click->Team->Synchronize with repository I get exactly what I want. The problem is, I only get the view for this one file I clicked. I need to change the view back to Java, to be able to chose the next modified file.
Is it possible, to compare all modified files, one by one, with the latest edition from the repository, without changing the view after each file?
Instead of right clicking a specific file, you can right click the entire project and perform the same operation you describe.
I wanted to remove a work item association to an outgoing change set and then associate it to a new work item. However, I selected Remove... on the change set to remove the association, but it instead deleted all my code changes. This is bad. Can this be reverted?
Since it is a change set, that means it is a committed set of files.
If you selected "Remove" in the "Related Artifacts / Associate Change Request" dialog box, this shouldn't be an issue.
You always can test and make a second repo workspace, load that second repo workspace in a second local workspace and see if you get the change set back.
You can modify the flow target of your second repo workspace, and make it reference your first repo workspace, to see if you get that same change set in the "incoming" section of the "Pending Changes" view.
I have two versions of a word document as two different files.
How can I get a track changed version?
Is there a way to compare them and merge as track changed version of these two documents?
PS: MS Word's comparing tool seems a solution it doesn't work for me. I need its "track changes" version.
First, turn on Track Changing
On the Review tab, in the Tracking group, click the Track Changes image.
To add a track changes indicator to the status bar, right-click the status bar and click Track Changes. Click the Track Changes indicator on the status bar to turn Track Changes on or off.
NOTE If the Track Changes command is unavailable, you might have to turn off document protection. On the Review tab, in the Protect group, click Protect Document, and then click Stop Protection at the bottom of the Protect Document task pane. (You might need to know the document password.)
NOW,
On the Tools menu, click Track Changes.
When the Track Changes feature is enabled, TRK appears on the status bar at the bottom of your document. When you turn off change tracking, TRK is dimmed.
Make the changes you want by inserting, deleting, or moving text or graphics. You can also change formatting.
Track changes while you edit
You can easily make and view tracked changes and comments while you work in a document. By default, Microsoft Office Word 2007 uses balloons to display deletions, comments, formatting changes, and content that has moved. If you want to see all of your changes inline, you can change settings so that tracked changes and comments display the way you want.
Balloons show formatting changes, comments, and deletions.
NOTE To prevent you from inadvertently distributing documents that contain tracked changes and comments, Word displays tracked changes and comments by default. Final Showing Markup is the default option in the Display for Review box.
Track changes while you edit
Open the document that you want to revise.
On the Review tab, in the Tracking group, click the Track Changes image.
To add a track changes indicator to the status bar, right-click the status bar and click Track Changes. Click the Track Changes indicator on the status bar to turn track changes on or off.
Make the changes that you want by inserting, deleting, moving, or formatting text or graphics. You can also add comments.
I created a label using the new label context menu:
I defined the parameters as follows: (unlocked)
Label:
ms_test
Description:
Created by ms
view:
//depot/Projects/Shared/...
//depot/Projects/AddIn/...
The label is created and shown in the label pane but when I select the label and click on the "List files at ms_test" menu item the log message states "Label ms_test points to 0 files".
Any ideas about why the label is not pointing to any files? How can I make this label to work?
thank you in advance.
Note: I have checked that the view paths are correct and there are file contents and subfolders under then.
I am using P4 client version 2006.1.105584 with no filter on the depot and my client is set to client view of the depot
That means no p4 labelsync or p4 tag commands occurred after the p4 label took place.
Did you create the label as described here?
The following instructions apply to the Windows client (P4WIN) only.
Click the label toolbar button to show the labels page.
Make a new label (right-click in the list); Give it a useful description.
Restrict the View to that needed by the project being labelled (See Using Wildcards and - - Excluding Files for examples).
Drag the project files from the depot over to the label;
Select Add/Replace Files Listed in Label… from the popup menu.
Perforce will open a dialog offering to replace the contents of the label.
Click Ok to add the files.
Even if your label currently references no files, you still can sync it with files:
Select the label from the Labels pane
Right-click to bring up the shortcut menu
Select Sync specific files to bring up a sync dialog
Click Select All
Click Ok
I suspect VonC's answer is pointing in the right direction. On a sidenote, it is worth pointing out that Perforce Labels are badly named and work very very differntly to Labels in virtually any other SCM system.
From the Docs
A Perforce label is a set of tagged file revisions. You can use labels to reproduce the state of these files within a client workspace.
Labels provide a method of naming important sets of file revisions for future reference. For example, you might want to tag the file revisions that compose a particular release with the label release2.0.1. At a later time, you can retrieve all the tagged revisions into a client workspace by syncing the workspace to the label.
Create a label when you want to:
keep track of all the file revisions contained in a particular release of software,
distribute a particular set of file revisions to other users, or
branch from a known set of file revisions.
Essentially what this goobledygook means is that whereas most people use Labels to do exactly what a Changelist number does (eg. Mark a particular point in time) it infact marks the set of files currently synced to in a particular client. This is a bizarre quirk of Perforce and possibly the worst design decision they made in an otherwise wonderful product.
You are probably better off taking note of the changelist number you want (generally the latest at a point in time) and the paths you wish to sync to , that is all the information you need to sync to a point in time.
As of Perforce 2010.1, the correct way to do this is using automatic labels, which are really just a way to name a changelist.