Stand alone tool for 3 way merge [SOLVED]

I'm looking for a standalone tool for a base - contributor - target merge. Use case is: I have old.source, old.patches and new.source. After patching new.source with old.patches there will be rejected.patches. Then I want to do a 3 way merge between (a) old.source patched with accepted patches, (b) old.source patched with all patches and (c) new.source patched with accepted patches.
What's a good tool for that, or (even better) is there a tool supporting the workflow above?
I know that this is part of every version control system, but it seems like an overkill to put things under version control just for this.
Last edited by grey (2009-10-21 13:43:15)

kdiff3 looks good, esp. this bit:
Special case: Files with the same name
If all files have the same name but are in different directories, you can reduce typework by specifying the filename only for the first file. E.g.:
kdiff3 dir1/filename dir2 dir3
plus the fact that they have a whole chapter on recursive directory merges in the documentation. And the fact that they *have* documentation - not a given with KDE apps these days.
Thanks!

Similar Messages

Stand alone installer for flash player

Is it still possible to download a stand-alone installer for Flash Player (or any Adobe product)?
I really, really, really, really have NO interstes in any download manager. All I want is an installer I can just download. There used to be an ftp site that had up to date software that could simply and easily be downloaded, but I couldn't find any current software on that site. Where should I be looking?

You can make a bootable USB stick to install using this free program.
Bootable USB Flash Drive – Diskmaker X

Stand alone installer for Yosemite

Is there a stand alone installer for Yosemite? I have extremely slow internet access and the download fails repeatedly from Software Update.
I would like to download at work and bring to my computer as taking my computer to work is not an option.
Thanks
...lane

You can make a bootable USB stick to install using this free program.
Bootable USB Flash Drive – Diskmaker X

Independent Stand-alone calculation for each Crosstab

Hi All,
In my report, I have two crosstabs in two different report header sections. In the first crosstab, I have Division and Company chars.
In the second crosstab I have Category and Company chars. I have one key figure (KF) in both crosstabs.
My expectation is to see independent, stand-alone results for these two crosstabs. But this is not the case..
Sum of Company X in the second crosstab (which is for category level) is displayed in the first crosstab (division level) for Company X.
But in my scenario, Company X has a different value in division level..
When I remove the second crosstab (category level) and refresh the report, then I see correct values for Company X in division level.
How can I tell the CR that each crosstab should run separately, without being influenced from other ones?
Below, I tried to show the issue..
Crosstab1:
Division A...........100
Company X..........55 -
> This is sum of below crosstab values (for company X).
Crosstab2:
Category C........60
Company X........20
Company Y........10
Category D........40
Company X.......35
Company Y.......5
Thanks
Ozan

Hi Ozan,
One of your crosstab will need to be a subreport. The reason they both show the same result is they are both using the same recordset. Your second crosstab needs to be run as a result of the Company in Report1.
Try creating a group in your report and drop the first Crosstab into the GroupHeader.
Now create a new report that matches your second Crosstab. Insert this new report as a subreport into the GroupFooter.
That should give you the result your looking for.
Good luck,
Brian

No Stand alone GWCHECK for Linux PO

HI,
I need to use a stand alone GWCHECK for a linux based PO. The GWADMIN version does not seem to work with the RESETMAINTFLAG on the user as I need to put in the database name.
Anybody know if there is a stand alone version of GWCHECK for a LINUX based Server?

Originally Posted by stevencodling
HI,
I need to use a stand alone GWCHECK for a linux based PO. The GWADMIN version does not seem to work with the RESETMAINTFLAG on the user as I need to put in the database name.
Anybody know if there is a stand alone version of GWCHECK for a LINUX based Server?
We include the binaries as part of the base server install. After installing the server install, you can find the binaries at the following location:
/opt/novell/groupwise/agents/bin/gwcheck
/opt/novell/groupwise/agents/bin/gwcheckt
Pam

Stand alone client for remote EJB corba error

Regarding problem below, I've checked System env variables
that weblogic server is using for CORBA classes:
javax.rmi.CORBA.UtilClass=weblogic.iiop.UtilDelegateImpl
org.omg.CORBA.ORBSingletonClass=weblogic.corba.orb.ORB
org.omg.CORBA.ORBClass weblogic.corba.orb.ORB
javax.rmi.CORBA.PortableRemoteObjectClass=weblogic.iiop.PortableRemoteObjectDelegateImpl
But these are server classes and not found in wlclient.jar and wljmsclient.jar. What classes should be used for client? What needs to be set in order to get successful remote RMI/EJB call to weblogic server?
Original post:
I have a stand alone spring client for simple stateless session EJB deployed on weblogic 9.2. I'm using spring (jdk 1.5) to call this remote EJB and the only way I can succeed is to have full weblogic.jar in my bootstrap classpath. Otherwise I get corba error:
CORBA BAD_PARAM 0 No; nested exception is:
org.omg.CORBA.BAD_PARAM: vmcid: 0x0 minor code: 0 completed: No
Interestingly, within same client I have JMS call to weblogic JMS and that fails if weblogic.jar is in boot classpath. Getting rid of weblogic.jar from boot classpath works if I have wlclient.jar and wljmsclient.jar in regular classpath (as per weblogic docs). I would think that for stand alone client all I would need is to weblogic client jars, why should I need to have full weblogic.jar?
I can't get those work together with same classpath. I wonder if anybody has some pointers and/or advice. I was looking to set system parameters for corba for weblogic client that maybe could help:
org.omg.CORBA.ORBClass
org.omg.CORBA.ORBSingletonClass
javax.rmi.CORBA.UtilClass
javax.rmi.CORBA.StubClass
javax.rmi.CORBA.PortableRemoteObjectClass
But I can't find definitive answer.
Regards,
-pp
Edited by mr.papini at 06/28/2007 9:05 AM

I'm stuck exactly with the same issue while trying to port my application from weblogic to jboss.
I tried to specify different ORB implementations (JacORB, OpenORB) for jvm option org.omg.CORBA.ORBClass, but JBoss couldn't get them instantiated. Native Sun implementation which is used in JBoss by default and can be instantiated, apparently is not fully compatible with weblogic security module.
So did you manage to find out the solution?
Edited by DigitalDude at 04/09/2008 11:47 PM

How do I copy albums in iPhoto to a stand alone drive for backups

How do I copy albums in iphoto to a stand alone hard drive for backup?

This User Tip
https://discussions.apple.com/docs/DOC-4921
has details of the options in the Export dialogue.

Stand alone charger for MBP batteries

I'm looking for a free-standing battery charger for my spare MBP batteries. Are such beasts made and if so, who makes the best one. It is really a pain to have to charge a battery on the computer, pull it out, and then stick another battery in to charge it. It is kind of a waste of lots of valuable time.

have you solve your problem? i have the same problem too.

Want firefox as a stand alone, not for yahoo

firefox for yahoo does not help
how can i get a stand alone firefox?
thanks

Check your Windows Control Panel > Add or Remove Programs for anything related to Yahoo and for anything that you don't recognize (sometimes "things like that" are named differently that what you might expect).
Then remove it or "them".
Also check the Firefox Addons Manager. {Ctrl + Shft + A}

Looking for a way to solve permission problem in windows 7

one of the biggest problems i have with this windows that even that i'm an administrator and the owner of the computer i always have permission problems folders i get a no access errors with files and folders even thoughe i should have full permisions i belive system restore doesn't work for me because permissions problem and i don't know what to do anymore i'v used uac i'v disable uac i downloaded a registry file to take owernship on files and folders and still problems so what can i do to solve all this problems?
and to be honest i really don't like the way windows 7 behave with permisions this is my computer and i am an administrator why do i have to fight to access folders like System Volume Information,Recovery,Documents and Settings why do i get the lock icon when i take owenership and i'm on the users list but when i add users everyting is fine?
10x in advance.:)

Hello,
This is by design. You cannot access the folder or files are protected by operation system even if your current user account is Administrator.
System Volume Information is a hidden and protected system folder that the System Restore tools uses to store it information and restore points.
In Recovery folder, there are two files: Winre.wim and boot.sdi. With these two files, you are able to boot the system to Windows Recovery Environment (WinRE) and do a repair without inserting a Windows 7 installation disc.
If you want to access the protected folders like “System Volume Information”, use the following method, but I do not recommend you do this. It may cause some potential problems:
1. Right click the System Volume Information folder and choose Properties.
2. In Security tab, click Edit and then click Add. Type in “everyone”(without quote) and click Ok.
3. Then “Everyone“ will be listed under ” Group or user names”, click Everyone, and check “allow” full control option.
As BurrWalnut said, the “Documents and Settings”, it is a junction. A junction point is also a protected operating system folder that points to another folder. The junction point is an important part of application compatibility and does not contain any data or other files. In Windows Vista and Windows 7, the “Documents and Settings” folder has been replaced with “Users” folder. All of your user profiles are saved in C:\Users\User name folder.
Thomas Lin

Stand alone driver for minimal application installer MyRIO

Dear All,
I am trying to deploy a complete installation package for a student lab, which would include:
1. exe application file compiled from a VI. This VI connects to the MyRIO via network streams.
2. labview run-time engine
3. driver for the USB LAN on the MyRIO device.
First 2 steps have been successful, and the VI communicates with the MyRIO device via WiFi. However, I would like to connect trough the USB and need a driver on the host machine. Installing a complete driver package is definitely an overkill for this occasion.
Therefore, I am looking for someone to point me out to a minimal installation package which would ensure proper communication with MyRIO through the USB.
With kind regard,
Ceslav
Solved!
Go to Solution.

Hey Ceslav,
The only official way to install the myRIO USB Drivers is to install the LabVIEW myRIO Module. This is the only method tested by NI and this method will provide the best user experience.
That being said if all of the computers have the same OS (ie same version and bitness of Windows) you can probably pull the driver form one machine and install it on another. By default the driver installs to:
C:\Program Files (x86)\National Instruments\CompactRIO\Staging\USBLAN\
I have not tested this and I don't know that anyone has done it so please make sure to fully test the new PCs after performing these steps. I highly recommend you install the myRIO modele rather than these steps.
Copy and paste the driver folder above from a PC with the myRIO module installed one PC to another without myRIO module installed.
Connect the myRIO via USB to the new PC.
Launch Device Manager
Find your NI myRIO [NI-myRIO-19xx-] under Other devices
Right click the device and select "Update Driver"
Select Install from a specific location
Enter path to the driver you copied from the other system. Windows might warn you regarding lack of Windows Logo testing. Click continue. Windows should successfully install the driver and the NI myRIO US Monitor should pop up.
Thoughly test the new PC with myRIO.
Let us know if that works for you.
Thanks!
-Sam K
LabVIEW Hacker
Join / Follow the LabVIEW Hacker Group on google+

Urgent Suggestions needed for best way to solve the problm

Hi Everybody,
I am working on an application which has to graphically show the data in the database. We are using JSP for the front end (the view for the time being will be simple, with text boxes and frames and DHTML) and tomcat as the Server. The data is huge and there ain't much business logic involvd (the user when he clicks on a URL I get the data pertaining to that particular table or column). Now my question is can Tomcat handle such huge data. What do u guys suggest, should I cache data at my server and server to the clients (instead of connecting to the DB for each and every request) If yes, can you guys please suggest a good way to cache data, I mean hat TableModel or HashMap will store data from different tables. Also the DB isn't updated for a while everyday. Also let me know if any of u guys still think a 3 -tier approach is advisable instead of the 2-tir approach
Thanks guys who made it this far

Well, of course a 3-tier approach is advisable. Also, yes, Tomcat can handle what you are doing. As far as caching data on the server, that is going to depend on your database and other requirements. Now about the graphical nature, you aren't going to be able to use JSP to draw graphics. The only way you can do it is to draw the graphics on the server-side, write out JPG files, but then the JSP won't know anything about where the image is, unless you always write the same number of images, in the same place, every time. Otherwise, you need an Applet. Hope that helps.

10g Forms and Reports Stand-Alone Install for Demo Purposes

Hi,
My boss asked me to set-up an Oracle 9i (9.2.0.0) database and OracleAS 10g (9.0.4) Forms and Reports standalone on a laptop she wants to use to demonstrate our Forms and Reports application for a potential customer.
The laptop is P4 with 512MB RAM, running Windows 2K Pro.
Has anyone tried this before? Any suggestions appreciated.
TIA,
Jim

1GB of RAM seems to work better. I just upgraded to 1GB from 512MB on a new ThinkPad running XP, 10g release 2 database, and 10.1.2 Application Server (Forms and Reports version). When I had 512, something broke and I wound up resetting the factory defaults using the IBM recovery tool. When I added the extra memory, everything went well. On the other hand, a four-year-old Dell desktop with 512MB works okay. Whatever.

Setting up CIMC on C220 stand-alone server for LDAP authentication.

I'm trying to setup the CIMC so that all users who require access to the console of the server have to be authenticated by Active Directory. I have placed my authenticated users in an AD group called "APAC IT Administrators".
Here are the fields I have so far:
Enable LDAP: Checked
BaseDN: DC=mydomain,DC=com
Domain: mydomain.com
Enable Encryption: Checked
Time Out: 60s
Configure LDAP Servers: Checked
Server 1: 10.0.0.100
Port: 389
Server 1: 10.0.0.101
Port: 389
Binding paramters:
Method: Login Credentials
Search Parameters:
Filter Attribute: sAMAccountName
Group Attribute: memberOf
Attribute: CiscoAVPair
LDAP Group Auhtorisation: Checked
Index: 1
Group Name: APAC IT Administrators
Group Domain: mydomain.com
Role: Admin
I've read here (http://www.aaviso.com/tech/?p=94) something about having to create a new attribute for domain users then assigning the attribute to the specific users, which I have not done so far as I do not have permission to do this and needs to be done by a higher source, but would this be the reason I cannot get the CIMC logon to authenticate against AD? Is there a log I can check to see what the problem is?
When I try to log onto the CIMC using the format "mydomain\myusername", I get the error "Login failed. Verify that your username and password are correct."
CIMC is version 2.0(3e).
Thanks.

Ingo thanks very much for replying..
We called up BusinessObjects Service to ask where we can download the SAP Integration Kit for Crystal XI but they had didnt have a solid answer for us.
We have the SAP GUI and also installed the Crystal Reports Designer XI from the CD. Also the installation of Crystal XI prompted me to download SP1 from internet and we did that.
As a result of the Service Pack installation another SAP component got installed called the "SAPInteractiveXL1" which is excel based. There is a connection SAP icon toolbar in SAPInteractiveCl1 but when the SAP GUI pops up and I input my logon information it just says says "Connecting..." and the excel just hangs....
So right now I have no clue where to get
- Client components from the BusinessObjects SAP Integration Kit

BPEL PM Stand alone designer for bpelz_0.0.96

I wish to operate the BPEL PM designer on a different machine than server. I found an example for the same at www.oracle.com/technology/products/ ias/bpel/htdocs/orabpel_technotes.tn005.html but that was for an older version bpelz_0.0.8. I want the same for bpelz_0.0.96... plz help

Make sure that the BPEL server configuration in the designer is not defined. That is, all the fields are blank.
You can set that in Eclipse Window -> Preference -> BPEL

Stand alone tool for 3 way merge [SOLVED]

Similar Messages

Maybe you are looking for