[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: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2004-10-26 13:26:12 CEST


> > > 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.

But Tortoise does not recognize these parts with TABs as "changed", if I set "ignore whitespace". So, why merge them into the wc, if they have not been changed?


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:29:58 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.