-
Notifications
You must be signed in to change notification settings - Fork 121
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
It doesn't sort PBXGroup section some times #17
Comments
could you please provide the diff project.pbxproj before and after adding the empty group? — On Thu, Feb 12, 2015 at 11:16 AM, edhub [email protected] wrote:
|
it's a business project so I couldn't do that. But once i got some time (not sure when), I can look into it. |
but I did manage to find a exercise project file with PBXGroup section not sorted correctly. It doesn't support file uploading, so I just copy & paste the PBXGroup part. If you need the whole project file, please let me know how can I send it to you. check this line: FE01095F654E29E4669FD59051BF4A79 /* Begin PBXGroup section / |
Hi, Could you send the problematic original project file via replying github notification email? Thanks |
here it is. On Sat, Feb 14, 2015 at 11:26 AM, Sean Wang [email protected]
|
i've replied the email with the file as attachment, but I didn't see it in the web page. |
It should not display on web page. But I also did not see it in email. Did you " reply all"? — On Sun, Feb 15, 2015 at 10:32 AM, edhub [email protected] wrote:
|
this time i reply all. Hope it's ok now. On Sun, Feb 15, 2015 at 10:34 AM, Sean Wang [email protected]
|
Still not got it... Could you put the project file content on somewhere public? Thanks a lot. |
I've uploaded the project to git hub :) |
@edhub Thanks a lot:) |
please checkout haha branch. and it's not sorted well at this line: B96C9F610970F8CF3E0BCCB41EFA9178 /* nav xibs */ = { /* Begin PBXGroup section / 1C8BAAD40D3B5F927C6DC0A762A820BF / Supporting On Wed, Feb 25, 2015 at 11:47 PM, Sean Wang [email protected]
|
I still not understand, there's only a Do you mean that it is not sorted by lower letters? That's the default action of BTW, to save both our time, you should just say what's the issue. just saying "not sort well" and pasting the long content is too confused... |
sorry, i replied it in email, and the result is a mess. Here, take a look at current orders in PBXGroup: shouldn't it be: |
Still cannot understand what you say. The |
please check line 114 On Sat, Feb 28, 2015 at 12:27 PM, Sean Wang [email protected]
|
You mean the whole |
Yes, I mean the order of group section. I concern about it, because it's
important: If the order is not consistent, horrible project file conflict
of will happen between merges.
Then why it get sorted sometimes? Is the sort done by Xcode? Maybe Xcode
will sort it according to your sort results. I made some test, and
confirmed it's Xcode made the sorting. It'll sort the group section when
you updated something in the project (add/remove a group/file, etc).
So, in order to keep the order consistent, I should add a empty group, run
xUnique, remove the group. Anyway, the issue is addressed and I found a
solution to it. Or maybe you are interested in making the sort in xUnique,
later :)
Thanks for the help, and the tool, of cause.
|
There is very huge work to do if dealing with all types of pbx sections and sub-sections in project file unless someone got a new thought. Currently I have no plans for that. About the order problem you concerned, in my experience, only if the content of the section is different, it will get conflicts in Git; if the order is different but the content is the same, it should not get conflicts; and that's why I made this tool:) |
since Xcode can do the sort trick, maybe you can trigger the feature from On Mon, Mar 2, 2015 at 5:00 PM, Sean Wang [email protected] wrote:
|
xUnique is just a simple pure python script, trigger from Xcode is not elegant and will be very complex imho. |
Hello, just wanted to confirm that the fact that PBXGroup sections are not ordered makes xUnique unable to resolve my merge conflicts. Anyway, thanks for the work! |
Sorry the inconvenience. Maybe you could run in Xcode before committing the project file? According to the discussion above, this would trigger Xcode sorting PBXGroup. |
XCode did not sort the PBXGroup section... However I managed to find a script that does the job: xUnique + SOCK = perfectly sorted my pbxproj :) |
So you mean sorting the items under pbxgroup instead of pbxgroup themselves? If so, I could add that :) — On Sat, Jan 23, 2016 at 2:07 AM, Ouss Ghalbz [email protected]
|
Yes, I meant items them by UUID. And it was not only in pbxgroup section, but in nearly every section. I had to add more sections into the SOCK script, because it only supported the "critical" ones according to the developer. It would be a great feature to add to xUnique, because it helps to reduce the number of conflicts. |
Could you make a list of these sections? I will look into it. — On Sat, Jan 23, 2016 at 2:24 AM, Ouss Ghalbz [email protected]
|
It is every section except
IMHO, the best sorting method for a .pbxproj file is:
|
|
open this enhancement issue to make me not being lazy.. |
When I use it for our project, I noticed that, it doesn't sort PBXGroup until I change something in the project file (for example, add a empty group). Otherwise, it works great so far. It happens when we first apply it for our project. I'm not sure whether it'll happen in the future.
The text was updated successfully, but these errors were encountered: