-
Status
- Suspended
-
Project
- jam
-
Severity
- C
-
Reported By
- David Abrahams
-
Reported Date
-
Modified By
- Shawn Hladky
-
Modified Date
-
Dev Notes
- (rmg)
Expanding tabs to spaces in a parent branch will create
regions of merge conflict wherever a file in a child branch
(branched before the expansion in the parent) has changes.
Are there merge tools that can ignore tab-vs-space
differences? (I'll look; seems like it should be possible,
sort of a "merge based on diff -w" thing... [But I note that
diff3 on my Linux host doesn't seem to know how to do this]).
(rmg)
Bill Ritcher (Mr. Guiffy) says Guiffy will do this, and 4.0
with even finer grained "ignore" control.
(rmg)
Plan is now to do this for the first release after Perforce 2002.2 has
hit the streets.