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

RE: Re: are directories versioned?

From: Monks, Peter <peter.monks_at_vignette.com>
Date: 2005-01-03 20:26:46 CET

G'day Andy,

This is part of what the "merge" command is for. See:

    http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2

for all the gory details.

Cheers,
Peter
 
----------------------------------------------------------------------
Peter Monks http://www.sydneyclimbing.com/
pmonks_at_sydneyclimbing.com http://www.geocities.com/yosemite/4455/
----------------------------------------------------------------------
 

 
 

> -----Original Message-----
> From: Andy Peters [mailto:devel@latke.net]
> Sent: Monday, January 03, 2005 11:16am
> To: Subversion Users
> Subject: Re: are directories versioned?
>
> Dale Worley wrote:
> > -----Original Message-----
> > From: erh@swapsimple.com [mailto:erh@swapsimple.com]
> >
> > I mean revert changes related to the additional and removal of
> > files, i.e. undo changes to the contents of the directory. There
> > have been several times where I've wanted to undo moving a file,
> > but still keep the changes to contents of the file.
> > -------------------------
> >
> > Here you're running up against the point that Suversion has
> no such "undo"
> > action. By judiciously selecting what revision you check
> out, you can *look
> > at* the past, but you can't *reverse* it. All you can do
> is check in a new
> > version which *looks* like a past version.
>
> This is exactly an issue I ran into. I made what I thought
> was a change
> in to a source file, committed the change, then at some point
> realized
> that I didn't need the change after all. I tried to figure
> out how to
> revert that one file back to the original state until I realized I
> couldn't do it. I ended up modifying the source file back to the
> original version (added a comment in my history header
> saying, "undoing
> those changes") and committing again.
>
> After thinking about it, I realized that if I'd made changes to this
> file other than the ones I wanted to undo, then a simple "revert to
> older revision" wouldn't work anyways.
>
> -a
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 3 20:31:37 2005

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