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

RE: auto merge and the matter of tabs

From: Joram Agten <Joram.Agten_at_telindus.com>
Date: 2004-07-19 16:58:02 CEST

> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: maandag 19 juli 2004 14:52
> To: Joram Agten
> Cc: users@subversion.tigris.org
> Subject: Re: auto merge and the matter of tabs
>
>
> On Mon, 2004-07-19 at 03:32, Joram Agten wrote:
> > Hello
> >
> > I have the following problem:
> >
> > - in revision 1020 I have a file with tabs
> >
> > - in the following revisions (currently 1154)
> > there are changes made to the tabs, they are aligned to some column
> > (so no fixed tab value)
> > additionally changes are made to all the files with some
> scripts (easy
> > to redo)
> >
> > - I want to restore version 1020 (svn update -r 1020)
> > rerun the scripts (now tabs are preserved) these scripts add some
> > lines of code
> > and then commit,
>
> $ cd working_copy
> $ svn cat -r1020 file > file
> $ edit file
> $ svn commit
>
that sounds good, that way my local checkout won't be outdated, and I don't need the merge cycle.
cool, now I can do this for the 2378 files in that directory, better write a script for that :-)
Received on Mon Jul 19 16:59:04 2004

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