[p4] Is there way to control 'blocking' in the merge tool?

[David Faison]

I used the "p4 resolve -dw" when merging, and this does have a positive
effect on the merge tool. 

It did not, however, fix this particular problem. 

Will using the "p4merge" environment variable have a different effect?
 


-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Weintraub,
David
Sent: Thursday, June 08, 2006 9:24 AM
To: Arnt Gulbrandsen; perforce-user at perforce.com
Subject: Re: [p4] Is there way to control 'blocking' in the merge tool?

> it's been tabs/spaces when it's bothered me.

There are at least three different whitespace and line ending options in
p4merge you can set during merge operations. Check the "Preferences" at
the bottom of the "Edit" menu.

-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Arnt
Gulbrandsen
Sent: Thursday, June 08, 2006 6:36 AM
To: perforce-user at perforce.com
Subject: Re: [p4] Is there way to control 'blocking' in the merge tool?

Rich Ireland writes:
> David Faison wrote:
>>  I've had some file merges where it gets uselessly out of whack.
>>  ...
>
> This can happen if you have line ending differences. Check for a 
> developer that is submitting windows CR-LF style files over Unix style

> files or vice-versa.

Or tabs/spaces.

It also can happen in circumstances where p4 simply hasn't found enough
verbatim lines (e.g. when every second line is changed in minor ways),
but generally it's been tabs/spaces when it's bothered me.

Arnt
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user