Is there any way to get Squeak to show the diffs between two change sets?
Nevin
On Mon, 28 Oct 2002, Nevin Pratt wrote:
Is there any way to get Squeak to show the diffs between two change sets?
Have you looked at DVS? http://beta4.com/squeak/aubergines/docs/dvs.html
On Monday 28 October 2002 01:02 pm, Nevin Pratt wrote:
Is there any way to get Squeak to show the diffs between two change sets?
Yes, especially using DVS.
Nevin Pratt wrote:
Is there any way to get Squeak to show the diffs between two change sets?
Nevin
I think I found *one* way (with Change Set's A and B):
1. File in "Change Set A" via the File List tool. 2. Select the "Change Set B" via the File List tool, and click the "Changes" button. 3. In the browser that pops up, push the "select conflicts" button. 4. In the top pain, right mouse click and select "remove unselected items". 5. Right mouse click again and select "remove up-to-date versions".
You can now select the methods that have been changed, one at a time, in the top pane, and the bottom pane will show you the changes.
But this seems to be a rather painful way to do this.
Nevin
Nevin Pratt wrote:
Nevin Pratt wrote:
Is there any way to get Squeak to show the diffs between two change sets?
Nevin
I think I found *one* way (with Change Set's A and B):
- File in "Change Set A" via the File List tool.
- Select the "Change Set B" via the File List tool, and click the
"Changes" button. 3. In the browser that pops up, push the "select conflicts" button. 4. In the top pain, right mouse click and select "remove unselected items". 5. Right mouse click again and select "remove up-to-date versions".
You can now select the methods that have been changed, one at a time, in the top pane, and the bottom pane will show you the changes.
But this seems to be a rather painful way to do this.
Nevin
And the alert reader will note that the above doesn't give you the additions in Change Set B, but only the conflicts between it and Change Set A, which happens to be what I was after, but wasn't exactly what I said :-)
Nevin
Hi,
----- Original Message ----- From: "Nevin Pratt" nevin@smalltalkpro.com To: squeak-dev@lists.squeakfoundation.org Sent: Tuesday, October 29, 2002 6:02 AM Subject: Diff between two change sets
Is there any way to get Squeak to show the diffs between two change sets?
Try the attached MergeBrowser. It can read two changeSets and display one merged view. First file-in 'ColoredPluggableListMorph.cs' and then 'MergeBrowser.cs'.
From the FileList, select the 'browse diff code' menu.
This tool is used daily for our project - NetMorph. Maybe useful.
Cheers, --- [:masashi | ^umezawa]
squeak-dev@lists.squeakfoundation.org
-
Avi Bryant -
Masashi Umezawa -
Ned Konz -
Nevin Pratt