| Summary: | Feature Request: change name space convention for rebase-helper package | ||
|---|---|---|---|
| Product: | [Fedora] Fedora | Reporter: | Josef Ridky <jridky> |
| Component: | git | Assignee: | Petr Stodulka <pstodulk> |
| Status: | CLOSED WONTFIX | QA Contact: | Fedora Extras Quality Assurance <extras-qa> |
| Severity: | low | Docs Contact: | |
| Priority: | unspecified | ||
| Version: | rawhide | CC: | amahdal, besser82, c.david86, chrisw, jbowes, jridky, phracek, pstodulk, tmz |
| Target Milestone: | --- | Keywords: | FutureFeature |
| Target Release: | --- | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
| Whiteboard: | |||
| Fixed In Version: | Doc Type: | If docs needed, set a value | |
| Doc Text: | Story Points: | --- | |
| Clone Of: | Environment: | ||
| Last Closed: | 2018-05-01 18:31:35 UTC | Type: | Bug |
| Regression: | --- | Mount Type: | --- |
| Documentation: | --- | CRM: | |
| Verified Versions: | Category: | --- | |
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
| Cloudforms Team: | --- | Target Upstream Version: | |
| Attachments: | |||
Created attachment 1205223 [details]
change in rebase-helper related to this feature request
I don't understand why the rebase-helper tool can't be taught to handle the names with LOCAL/REMOTE in addition to OLD/NEW rather than adding a non-upstreamable patch to git in fedora. Created attachment 1205928 [details]
Patch with requested change
This change is not requested because rebase-helper is not able to work with files, that have LOCAL/REMOTE naming convention. The point is, that user see in one window 3 tabs, where each tab has label equal to name of file, which is opened in this tab. So to prevent user confuse (which tab contains old code, which tab contain new code and in which tab is result of merge), we would like to have choice to choose the suffix of temporary file used in merging by git mergetool. I will contact upstream with this request. Created attachment 1205930 [details]
change in rebase-helper related to this feature request
Hi Josef, is there any progress? I don't remember our last conversation about this topic, but if I remember well, you do not need it anymore. (In reply to pstodulk from comment #6) > Hi Josef, > is there any progress? I don't remember our last conversation about this > topic, but if I remember well, you do not need it anymore. Upstream do not want to implement this feature in way as it is. It will be probably better to ask someone from rebase helper engineers, if is this feature still requested. If yes, I will contact upstream again and I will prepare new patch for this feature. I'm going to close this for now, as it doesn't look like there's any changes for this in the git package. If changes are made upstream we'll pick them up in due time, of course. |
Created attachment 1205205 [details] Patch with example of requested change Description of problem: When using rebase-helper package, we have problem with file names created by git mergetool. They haven't suitable name. So we are confused, when the files are opened with meld package. I have prepared patch for git package, so it can be taken as *example* of requested change. This request should be related even to rebase-helper package.