Byron Nevins wrote:
Messy and difficult especially since there are a lot of files changed
Here is one way:
Checkout the old failed revision
Take your files from that revision and drop them into the current latest version
You should be back to where you were just before the bad checkin.
I wrote a script to do this. It seems the only easy way to handle the
problem.
Warning -- make sure you don't tromp over changes that someone else made to the same files (unlikely)
Unlikely in naming, and very unlikely in the orb-iiop module (I am the
owner of that module).
Ken.
Sent from my iPhone
On Oct 5, 2010, at 2:17 PM, Ken <ken.cavanaugh@oracle.com> wrote:
Jane Young wrote:
Yes... like Byron pointed out, you can revert my commit locally and get your changes back in your workspace after you do a "svn update". To do that you use the "svn merge" command.
I looked at the svn merge command, but I don't understand this (svn is not my favorite SCM system).
What svn merge command do I need to get the changes from 41383 into my working copy which is currently
at rev 41398, so that I can fix whatever broke the build (which OF COURSE built perfectly for me
after deleting the ORB from ~/.m2/repository, mvn clean, mvn -U install: what ELSE can I do to make
sure this doesn't happen?) into a form where a svn commit commit the correct changes?
Thanks,
Ken.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@glassfish.dev.java.net
For additional commands, e-mail: dev-help@glassfish.dev.java.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@glassfish.dev.java.net
For additional commands, e-mail: dev-help@glassfish.dev.java.net