[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Files on trunk overwritten...

From: C M <cmanalyst66_at_gmail.com>
Date: Mon, 29 Apr 2013 14:58:44 -0500

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.

I re-ran it without the dry run, then ran diff after the update.

We are set. Thank you.


On Mon, Apr 29, 2013 at 1:41 PM, Les Mikesell <lesmikesell_at_gmail.com> wrote:

> On Mon, Apr 29, 2013 at 1:23 PM, C M <cmanalyst66_at_gmail.com> 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 commit or so if more changes were added later. In any case
> it is fairly easy and safe to experiment - just use a working copy
> with no other changes and don't commit until you get what you want
> (and you can tell by diffing against the version where things were
> correct). If you don't like the merge results, just revert to the
> unmodified checkout and try again.
> --
> Les Mikesell
> lesmikesell_at_gmail.com
Received on 2013-04-29 21:59:18 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.