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

Re: [TSVN] Merging problem with TABs

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-10-26 13:18:48 CEST

On Tue, 26 Oct 2004 13:14:44 +0200, Thomas Börkel <tbo@ap-ag.com> wrote:
> > So it just takes the tabs from one file and doesn't check if the other
> > file has spaces instead of tabs.
> > Don't ignore the whitespaces and you'll be fine.
> I tried, but then I have half of the file conflicted.

No surprise. If you change whitespaces all over a file, you get conflicts.

> What I don't understand is, why it does not leave the unchanged parts (with tabs or not) alone, meaning take them from the wc?

Because you're merging something in. And by doing that, you want the
changes merged in your working copy. That's why the 'other' file has
priority over your working copy file.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 26 14:19:48 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

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