Re: Files on trunk overwritten...

2013-04-29 Thread C M
This syntax did the trick: svn merge -r661:177 --dry-run https://XXX/trunk/directory_path In preview mode, SVN showed me the files it was going to update. That list matched the files we knew had been modified erroneously. There weren't any changes to that particular directory contents since r177.

Re: Files on trunk overwritten...

2013-04-29 Thread Les Mikesell
On Mon, Apr 29, 2013 at 1:23 PM, C M wrote: > The working copy (head revision) is at 661. 177 is what I want to go back > to. > > Is this the syntax to use (from within the working copy: > > svn merge -r661:177? Yes but that should undo all changes after 177 and you might only want the next commi

Re: Files on trunk overwritten...

2013-04-29 Thread C M
The working copy (head revision) is at 661. 177 is what I want to go back to. Is this the syntax to use (from within the working copy: svn merge -r661:177? On Fri, Apr 26, 2013 at 8:53 PM, Les Mikesell wrote: > On Fri, Apr 26, 2013 at 6:18 PM, C M wrote: > > Deleting the trunk is not an op

Re: Files on trunk overwritten...

2013-04-26 Thread Les Mikesell
On Fri, Apr 26, 2013 at 6:18 PM, C M wrote: > Deleting the trunk is not an option. > > To do the reverse merge, I created a working copy (which includes the files > which are incorrect and I want to revert via the merge). > Within my working copy, I typed: > > svn merge -c -177 https://trunk/path_

Re: Files on trunk overwritten...

2013-04-26 Thread C M
Deleting the trunk is not an option. To do the reverse merge, I created a working copy (which includes the files which are incorrect and I want to revert via the merge). Within my working copy, I typed: svn merge -c -177 https://trunk/path_to_directory 177 being the revision I want to roll back

Re: Files on trunk overwritten...

2013-04-25 Thread Lorenz
C M wrote: >Some files were committed to trunk which have incorrect updates. > >What's the easiest way to roll back to the previous versions (before the >erroneous changes were committed)? another way is to delete the trunk and reestablish it by copying the last correct trunk revision. This way a

Re: Files on trunk overwritten...

2013-04-25 Thread Les Mikesell
On Thu, Apr 25, 2013 at 2:34 PM, C M wrote: > I am certain there is simple way out of this situation. > > Some files were committed to trunk which have incorrect updates. > > What's the easiest way to roll back to the previous versions (before the > erroneous changes were committed)? > > Should I

Re: Files on trunk overwritten...

2013-04-25 Thread Andy Levy
On Thu, Apr 25, 2013 at 3:34 PM, C M wrote: > I am certain there is simple way out of this situation. > > Some files were committed to trunk which have incorrect updates. > > What's the easiest way to roll back to the previous versions (before the > erroneous changes were committed)? > > Should I

Files on trunk overwritten...

2013-04-25 Thread C M
I am certain there is simple way out of this situation. Some files were committed to trunk which have incorrect updates. What's the easiest way to roll back to the previous versions (before the erroneous changes were committed)? Should I checkout the previous revision and commit them over the er