Re: [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes

[Chuck Lever <cel@citi.umich.edu>]

[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]

Catalin Marinas wrote:
> On 16/11/05, Blaisorblade <blaisorblade@yahoo.it> wrote:
>>>Another option would be to
>>>remove the file and leave both file.older and file.remote in the tree
>>>(here .remote means the version in the patch)
>>
>>I remember that at times, but .remote is very confusing... I see that's the
>>mishandling is induced by various sources, maybe including "merge" itself,
>>but that program (and possibly others) supports changing the labels, and this
>>should probably be done (using "original", "patched" and "upstream"
>>probably).
> 
> 
> I know that diff3/merge support labels. I don't exactly remember my
> reasons but I think that I chose those namings because StGIT was
> supporting another type of merge where "patched" etc. did not apply.
> 
> I agree that we should change them. I would rather use "ancestor",
> "patch" and "base" but I don't have a strong opinion.

just a data point:

i use "original" "patch" and "older" (set up in .stgitrc) because i 
found the default labels to be confusing.

but "original" "patch" and "upstream" make sense to me.

[-- Attachment #2: cel.vcf --]
[-- Type: text/x-vcard, Size: 439 bytes --]

begin:vcard
fn:Chuck Lever
n:Lever;Charles
org:Network Appliance, Incorporated;Linux NFS Client Development
adr:535 West William Street, Suite 3100;;Center for Information Technology Integration;Ann Arbor;MI;48103-4943;USA
email;internet:cel@citi.umich.edu
title:Member of Technical Staff
tel;work:+1 734 763 4415
tel;fax:+1 734 763 4434
tel;home:+1 734 668 1089
x-mozilla-html:FALSE
url:http://www.monkey.org/~cel/
version:2.1
end:vcard