Can't Merge a Sub-Module! #1
Comments
|
Maybe I have to be added to the base repository as a contributor before I can make this work? |
|
From @macmade on November 12, 2014 12:1 I'm a bit surprised you added me on your fork... Not the usual kind of workflow. The base repository is a mirror of the Objective-C runtime version 437.1, as available at opensource.apple.com. But that's still a mirror, and so there's no change to do. If you need to modify sources of the Objective-C runtime for some reason, I suggest you first check for a new version at opensource.apple.com. |
|
But there are forks of Objective-C and its run-time components everywhere on GitHub. Just do a search for 'objc4' here on GitHub, and you'll find at least nine copies of Apple's Objective-C source code! I'm trying to merge all of them this repository so that we only have to deal with one of them! The first step that is required for me to be able to do that is one in which I merge your repository into that target repository, but I can't easily do that because of how your repository deletes everything but the 'runtime' folder found in the other repositories that I want to merge together, empties this folder's contents out into your repository's root directory, and then deletes the now-empty 'runtime' folder! If I can't undo this, then I can't merge your repository repository into mine! I would have notified you about this on this repository's base repository, but it doesn't have GitHub Issues enabled! |
|
From @macmade on November 12, 2014 14:11 Then why did you a fork? If you want to create a repository with other repositories, use submodules. |
|
From @macmade on November 12, 2014 14:14 And please, if you still think you need to modify something, do it in your own fork, as you've created one. |
|
But can you merge a fork of another repository into your own as a submodule while still maintaining the link between the repositories even after integrating the submodule into your repository? |
|
From @macmade on November 12, 2014 16:15 I don't understand why, what and where you want to merge. Use submodules, that's all you need to do... |
|
I suppose that would be a simpler way to do it, wouldn't it? And here I was, thinking that trying to merge a submodule created out of my fork of your repository into this repository using these instructions would be a much better idea! But what'll happen to my submodule when I merge its parent repository with some others? Will the link survive intact, or will it be lost in transit? |
|
Oh, wait…I think I lost the inter-repository linkage in my last attempt. I got all of the repository history, though, and maybe that's all that really matters? |
|
From @macmade on November 12, 2014 17:47 Let's start again, as this is getting nowhere... Basically, what you want is a repository which contains multiple repositories from GitHub, preserving what you call a link... Am I right? Sent from my iPhone
|
|
Er…yes, I suppose, but I don't want all of the repositories to be side by side in their own separate little folders; I instead want them to be saved in as different revisions of the same repository. This is because the repositories in question, as listed here are actually all just different snapshots of the same repository. Your repository seems to be the oldest snapshot of Apple's Objective-C code as stored on its repository, so your repository is the first one with which I am dealing. To do so, I plan to either merge your repository into my target repository completely, getting rid of yours entirely, or have this target repository contain your repository as a sub-module or other form of linked repository in an older commit. The end result of this whole giant mess of a merger should be an exact mirror of the latest version of the Objective-C source code stored in the current state of Apple's repository, but with older versions of the Objective-C source code saved as older commits. |
|
From @macmade on November 12, 2014 19:1 I think you're overthinking this whole stuff... If I understand, you want your own objc4 repository to contain specific tags, each one containing one (and only one) of the many repositories containing the Objective-C runtime... So there's nothing complicated, and nothing involving merges and whatsoever.
|
|
I think I get what you're saying, but I'm pretty sure that your repository is the only one that I'll need to add into mine as a sub-module; I'll probably add the rest of them in as remote-tracking branches and then merge the resulting branches together in version order as discussed here. |
|
From @macmade on November 12, 2014 23:29 Whatever... Try to avoid loosing time and getting headaches with queer procedures... Start using submodules, and use tags... Trust me on this one. |
|
But all of these repositories contain at least some of the same files, and most of them have revisions that are exactly the same! Aren't tags for keeping track of different files from different sub-repositories that all have to do with at least one of their parent repositories' releases? What I want to do is merge a bunch of remote-tracking branches together without losing my capability to track their parents. Is that possible when one of the branches isn't really a true remote tracking branch and is, instead, a branch containing a sub-repository, or will I lose connectivity? |
|
From @macmade on November 22, 2014 15:7 Well, tags are usually meant to manage different versions/releases of some source code. Branches are generally used for different implementations, while in development, feature experimentations, etc... Obviously you're free to use them as you want... Last thing: you began working with a fork of my repos, and you now imagine my repos has something special because you can't achieve what you thought would be nice. Let me just tell you this repository has nothing special regarding its configuration. How could it be, with only 4 commits in a single branch? So if you have issues with it, you'll have issues with the others too... So keep it simple... |
|
No, no, no; it's not your repository's configuration that's causing me trouble, but the fact that the file structure that you use in your repository is different from all of the others (listed here.) What you have in your repository is what all the other repositories have inside a folder named 'runtime,' just like Apple does in its repository. That is the reason why I can add your repository, but none of the others on my 'to do' list, as a sub-module. (As discussed earlier on in this thread, I originally tried to fix this problem by making your repository's directory-tree structure match that used in all of the others so that I could just create a tracking branch for each repository involved and then merge them, but that procedure apparently disconnected the fork in which I tried to do this from your repository in such a way that I could no longer create pull requests. As such, I've switched to including your repository in my main one as a sub-module inside its own branch and, therefore, no longer need this fork — I would have deleted it a while back because of this, but this issue is still attached to it.) For all of the other repositories involved in this big mess, I will, at least at first, need to track them using other branches. I do intend to merge everything together into my main repository's 'master' branch in the end, though, and will most likely do so by making sure that every single one of my branches has been tagged similarly enough so that the merger can be done by tag. |
|
@macmade: Can you add me to your upstream repository as a contributor so that I can move this issue there using one of the tools mentioned here and then delete my fork? I've included your upstream repository in my main Objective-C repository's 'macadamia' branch as a submodule, so I don't really need this fork any more. |
|
From @macmade on December 1, 2014 0:30 @RandomDSdevel No... |
|
@macmade: Then can you migrate my issue for me so that I can delete this fork? |
|
From @macmade on December 1, 2014 0:41 @RandomDSdevel Sorry but no. This issue has nothing to do with my repository. Plus I don't want to activate the issue system on such a repository, as it simply doesn't make sense at all. |
|
@macmade: I just don't want to lose this issue in the process. Maybe I'll move it to my main 'objc4' repository instead, then. I'll still need your help merging your repository into my main one, though, so could you follow me over there? |
|
@macmade: OK, the issue's been moved and I've deleted the old fork. |
|
@macmade: You can remove yourself from the 'Assignee' and 'Collaborators' lists once you've gotten yourself back on the record as a 'participant' in this issue's discussion. (I'm just trying to facilitate that here, 'kay?) |
|
@macmade: Oh, wait…I think that I put you back on this issue's 'Participants' list just by temporarily assigning this issue to you until you reply to this thread again; I'm going to leave you as this issue's assignee until you've commented again so that you don't drop off of the 'Participants' list once you're no longer assigned to work on this issue, though, all right? |
|
Once again, do whatever you want with your forks, repos, etc... Please don't assign my an issue just because you want/need help with your own repositories and stuff, or just because you want me to reply... |
RandomDSdevel
changed the title
|
OK, @macmade, here's what I need your help with: you don't seem to be maintaining your copy of Objective-C any more, and there should really only be one mirror of the part of Apple's repository used by the company to host Objective-C, so what I've been trying to do is permanently merge your Objective-C repository into my Objective-C repository. The first step to doing that is adding a sub-module containing your repository into a branch of my repository that I prepared to receive such a sub-module, and I've done that. The second step to merging your repository into mine is following these instructions, and, as I've tried to tell you before, I've already attempted to do this once. The procedure in question did not, however, delete your repository after making all of the forks that are currently branched off of it point to my instantiation of your repository. Because of this, I initially thought that I had done something wrong in the process of attempting to merge a sub-module containing your repository into a branch of my repository and therefore eventually managed to revert the changes which I committed as part of my first try at doing this. What I now realize, though, is that for this to work, I'm going to need your cooperation: after I merge the sub-module containing your repository into the branch of my repository which I've prepared for it, I'll need you to help me migrate the forks currently attached to your repository over to that branch of my repository and then delete your repository. Now do you understand what I've been trying to do all of this time? |
RandomDSdevel
changed the title
|
No... My repository is a mirror of a specific version of the runtime. If you decided to waste time on this, fair enough. But please don't waste mine. |
|
@macmade: But you could still check that specific version out even if there was only a single mirror of Apple's Objective-C repository like there should be! |
|
@macmade: See above. IMHO, only one Objective-C repo mirror should exist on GitHub, and this issue is documentation on the first step to achieving that. |
|
Ok kiddo... Now you crossed the line... And you just piss me off again and again, assigning issues that only exists in your sick head... You know what? You've won... Get a life... |
|
@macmade: Um…okay? And I wasn't exactly being rude, per se, just persistent. You, my friend, are the one who's being rude for interpreting my insistence as impertinence. And I would have thought that you would've been more helpful; so much for solidarity in productivity! |
From @RandomDSdevel on November 3, 2014 21:34
After finally succeeding in running a script described here on this repository, I cannot seem to create a pull request that will allow me to merge my work with that which is stored inside this repository's base repository. The problem appears to be that, in the scenario which I have created, pull requests don't work. In order to merge my work, I apparently need to be given the permissions necessary to push my commits directly to this repository's base repository.
Copied from original issue: RandomDSdevel/OBJC4-437.1-Runtime#1
The text was updated successfully, but these errors were encountered: