auto merge and the matter of tabs

[Joram Agten <Jo...@telindus.com>]

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, but since my BASE version will be an old one (1020), I need to run update first
when running update, svn merges all my files (non trivial changes) but will use the whitespace formatting of the newest version (HEAD), which in my case is the wrong white space formatting.

I see a few solutions here, but don't know how to realize them
- specify what white space formatting to use for svn update (from HEAD or from my file)
- disable the automerge feature alltogether


Regards
joram

Re: auto merge and the matter of tabs

[Ben Collins-Sussman <su...@collab.net>]

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




---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org