Request: swap order of windows in 2-way diff and 3-way merge

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
hypert
Posts: 5
Joined: Wed Nov 28, 2007 11:34 pm

Request: swap order of windows in 2-way diff and 3-way merge

Post by hypert » Wed Nov 28, 2007 11:41 pm

This is somewhat related to another request, http://support.sourcegear.com/viewtopic.php?p=37162, but I think it has its own merits too.

In the 2-way diff and 3-way merge windows, could we get an easy way (press a button, drag-and-drop, etc.) to re-arrange which files are located in which "pane" of the window?

Since I usually launch DiffMerge from Explorer, the file on the right is always the one "last" in Explorer, and this doesn't necessarily match the order I'd like to view/merge them in!

Thanks.

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

Do you have 3.1 ?

Post by jeffhostetler » Thu Nov 29, 2007 9:02 am

Do you have 3.1? I put a change/fix in between 3.1beta and 3.1 so that when you use Explorer it always opens the FileOpen dialog before actually populating the window. There's a Swap button that'll let you choose which file is in the left and which is in the right (since Explorer doesn't define an ordering)

I'll log a feature request for the more general request of swapping windows.

jeff hostetler

hypert
Posts: 5
Joined: Wed Nov 28, 2007 11:34 pm

Swapping

Post by hypert » Thu Nov 29, 2007 6:58 pm

Yes, I have 3.1. I was actually doing most of my launching by dragging the file icons to DiffMerge's shortcut icon. That bypasses the dialog.

I just tried it w/ the CM (right-click) and I see the dialog box now. For now, I can certainly cut/paste the filenames to swap the order, but a more general swapping would be wonderful!

I'll look forward to it in a future release - thanks!
:D

btomczak
Posts: 2
Joined: Tue Jun 10, 2008 1:16 pm

Diff Window file swapping

Post by btomczak » Tue Jun 10, 2008 1:20 pm

Whatever happened to this request?

I have Dreamweaver configured to use Diffmerge. The file selection dialog is always bypassed and there is no way to change which file appears on the left. It would be great to have a swap button of some sort in the diff window to get around this.

-bill

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

Window swapping didn't make it into 3.2. Sorry.

Post by jeffhostetler » Tue Jun 10, 2008 3:10 pm

Window swapping didn't make it into 3.2. Sorry.

However, you can add /shex to the command line
arguments. This will force the file selection dialog
to appear. (This is what the shell extension does
because the shell doesn't guarantee any ordering
when multiple files/folders are selected.)

Hope this helps,
jeff

hypert
Posts: 5
Joined: Wed Nov 28, 2007 11:34 pm

Re: Window swapping didn't make it into 3.2. Sorry.

Post by hypert » Tue Jun 10, 2008 10:04 pm

jeffhostetler wrote:Window swapping didn't make it into 3.2. Sorry.

However, you can add /shex to the command line
arguments. This will force the file selection dialog
to appear. (This is what the shell extension does
because the shell doesn't guarantee any ordering
when multiple files/folders are selected.)

Hope this helps,
jeff
It does help - thanks!

Now, is there anyway to make that work in the Mac version? :D

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

Sorry, but no.

Post by jeffhostetler » Wed Jun 11, 2008 6:16 am

Um, sorry but no.

I put the command line option under the same #ifdef as the
Windows-only shell extension feature. I'll log a bug to change
this.

However, on the MAC you can use the example shell script
that I included in the package to reverse the file args. Then
have Dreamweaver launch your modified script. (I've not
used Dreamweaver so it's hard for me to say if this is something
you'd always want to do or if you selectively want to swap them.)

Hope this helps,
jeff

btomczak
Posts: 2
Joined: Tue Jun 10, 2008 1:16 pm

Re: Window swapping didn't make it into 3.2. Sorry.

Post by btomczak » Wed Jun 11, 2008 7:26 am

jeffhostetler wrote:Window swapping didn't make it into 3.2. Sorry.

However, you can add /shex to the command line
arguments. This will force the file selection dialog
to appear. (This is what the shell extension does
because the shell doesn't guarantee any ordering
when multiple files/folders are selected.)

Hope this helps,
jeff
Thanks! This works and will do just fine for now.
bill

ccdsystems
Posts: 2
Joined: Mon Jun 20, 2011 11:19 am

Re: Request: swap order of windows in 2-way diff and 3-way m

Post by ccdsystems » Mon Jun 20, 2011 11:39 am

Did this code make it into v3.3?

I would like to +1 this request, but for a different reason that has already been given. :)

We use DiffMerge to manage the code maintenance of two developers (I am one of them), and while the correct solution is to use a proper VCS, there are times where I want to simply incorporate some of my changes (not all of them) into a common location. However, sometimes in this process, I see the other developer has done the same, and I want some of their changes in my code.

So, I diff from my (read-only) copy to the shared (editable) copy, and while updating the shared copy, I notice code I want in my read-only version. I don't necessarily want a "merge from right" option, because that's too dangerous, but I'd like the option to save any changes and swap the two versions, making the shared read-only and my copy editable, for the purpose of grabbing that one or two changes.

Today, to do this, I need to Ctrl-O, manually cut-and-paste the two filenames into the opposite boxes, then OK, which opens a second window with the files in the reverse order, allowing me to take the code I want.

lbauer
Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear

Re: Request: swap order of windows in 2-way diff and 3-way m

Post by lbauer » Mon Jun 20, 2011 4:38 pm

This hasn't been implemented yet. We have feature request 12742 logged for this functionality; I'll add your vote.

It will be evaluated for an upcoming release of DiffMerge.

Thanks for your feedback!
Linda Bauer
SourceGear
Technical Support Manager

ccdsystems
Posts: 2
Joined: Mon Jun 20, 2011 11:19 am

Re: Request: swap order of windows in 2-way diff and 3-way m

Post by ccdsystems » Tue Jun 21, 2011 9:42 am

However, I did notice that in your latest v3.3, that the filenames box did have a Swap button for the names, which makes flipping a 2-way diff a lot easier. This scratches my itch for the time being, so thank you :D

lbauer
Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear

Re: Request: swap order of windows in 2-way diff and 3-way m

Post by lbauer » Tue Jun 21, 2011 9:43 am

You're welcome. :D
Linda Bauer
SourceGear
Technical Support Manager

Post Reply