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

Re: Commit a mixed revision working copy as new HEAD?

From: Zachary Pincus <zpincus_at_stanford.edu>
Date: 2005-02-24 07:06:35 CET

Thanks for the reply!

One nice thing about using svn update, merge and copy is that they are
all savvy to the file's history -- the fact that the version being
copied or moved is in fact already under svn control, and has its own
provenance that should be recorded.

So, while svn cat has the right syntax, you lose the record of where
the file came from. In most cases, it should be a minor loss. (I'll use
svn cat for similar tasks now that I know about it!) Still, I wonder if
there is a way to get both a coherent syntax for these operations and
be able to retain full provenance information.

Thanks,

Zach

On Feb 23, 2005, at 8:36 PM, Matthew S. Moore wrote:

> Zachary Pincus wrote:
>> Hello,
>> I'm wondering if there is a way to commit a mixed revision working
>> copy as the new HEAD.
>> This need came about because I was trying to figure out how to back
>> out of some problems I had. Specifically, I needed to un-delete one
>> file and roll back another file to the exact state it was several
>> revisions earlier.
>> It was easy to do the following:
>> svn update -r100 file1 # roll back to the the good revision of
>> file1
>> svn update -r120 file2 # get the last version of file2 before it
>> was deleted
> Zachary,
>
> I am new to subversion (less than two weeks, but three years with
> ClearCase) but I think the solution to simplify this process of
> rolling back some files is to use svn cat:
>
> svn cat -r100 file1 > file1 # copy the old version over your working
> copy.
> svn cat -r120 file2 > file2
>
> Then you should be able to perform a commit as usual!
>
> Matthew
>
> --
>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~
> Matthew S Moore Alaska Satellite Facility
> Configuration Manager Geophysical Institute
> & Development Engineer University of Alaska Fairbanks
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~
>
> ---------------------------------------------------------------------
> 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 Thu Feb 24 07:08:49 2005

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.