Hi!
I wonder if I can somehow merge a branch to the main trunk, ignoring white space
diffs. Example:
< foo.html
=
> 1.2.2.1
I also get weird conflicts during merges where the diffs are exactly the same.
< foo.pm
foo
=
foo
> 1.2.2.1
I even get weird conflicts like this
At 4:07 AM -0500 2/12/04, m0llbuz_ wrote:
Hi!
I wonder if I can somehow merge a branch to the main trunk, ignoring
white space diffs. Example:
< foo.html
=
1.2.2.1
While I find this annoying, it is really the correct thing to do.
Right now I am writing a lot of Python code and it is p
m0llbuz_ writes:
>
> I wonder if I can somehow merge a branch to the main trunk, ignoring
> white space diffs.
Not with CVS -- that's not a merge, it's something else. If you're sure
you know what you're doing, you can use CVS to get whatever kind of diff
you want and then try to apply it with
> At 4:07 AM -0500 2/12/04, m0llbuz_ wrote:
> >
> >< foo.html
> >=
> >
> >> 1.2.2.1
>
> While I find this annoying, it is really the correct thing to do.
> Right now I am writing a lot of Python code and it is perfectly
> reasonable to change the white space inside a multi-line str
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
m0llbuz_ wrote:
>>At 4:07 AM -0500 2/12/04, m0llbuz_ wrote:
>>
>>>< foo.html
>>>=
>>>
1.2.2.1
>>
>>While I find this annoying, it is really the correct thing to do.
>>Right now I am writing a lot of Python code and it is perfectly
>>
>--- Forwarded mail from [EMAIL PROTECTED]
>> At 4:07 AM -0500 2/12/04, m0llbuz_ wrote:
>> >I also get weird conflicts during merges where the diffs are exactly the same.
>> >
>> >< foo.pm
>> >foo
>> >=
>> >foo
>> >> 1.2.2.1
>>
>> I've seen this too. Are there white space differenc
