Skip to content
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

suddenly database.properties pop up in my unstaged files in git #10

Open
csakis opened this issue Jun 29, 2016 · 2 comments
Open

suddenly database.properties pop up in my unstaged files in git #10

csakis opened this issue Jun 29, 2016 · 2 comments

Comments

@csakis
Copy link

csakis commented Jun 29, 2016

I believe the changes to the and other metadata should be filtered out by Swiper, shouldn't they?
recenlty, I see lots of views and forms popping up in my Unstaged changes in git. I am not sure what I am supposed to do to avoid them.

I right clicked on all my forms, views, xPages, ccs, codes and selected Swiper -> filter on each of them.
All filtered files showed up in my git changed files and I staged them and did a commit.

I'll see if these actions will solve the problem.

@csakis csakis changed the title suddenly database.properties pop up in my unsatged files in git suddenly database.properties pop up in my unstaged files in git Jun 29, 2016
@camac
Copy link
Owner

camac commented Jun 29, 2016

Hi Csaba,
Are there any actual 'changes' to be committed?
Sometimes, if swiper has to filter again (due to rebuild, last accessed date update etc), the timestamp of the on disk file will update, however there are no changes to the actual content.
The updated timestamp causes git to think something is changed, but when you add the file to the 'stage' it will then realise there is nothing to commit, and removes the file from the unstaged section.

A quick way to find out which files have actual changes is to stage everything, and then unstage everything. Only the files with actual changes will remain in unstaged after this.

Does this explain the problem or is it something else?

@csakis
Copy link
Author

csakis commented Jun 29, 2016

I will tyr to move the files on and off the stage and see what happens. But I believe my problem is deeper than that. Let me try to explain.
I am obviously using source control with swiper to do my XPage development. Once I am happy with my product, I am trying to move the database from the dev server to the production server. My process of doing this is simple and I am not sure that it is correct. Here it is.

  1. When I am happy with my application I do a commit and close my dev.nsf in Designer.
  2. Then I open the production.nsf on the production server in DDE..
  3. I go to Team Development > Associate with Existing On-Disk Project > replace existing associations (and I choose the on-disk project associated with the the dev.nsf)
  4. Sync with On-Disk project
  5. Done

To my surprise, the production.nsf ACL was completely rewritten with the ACL on the dev server. In retrospect, it's not such a surprise, since the ACL is stored in the database.properties file.

The question is, is this the proper way to move between development server and production server?

Shall I just add the database.properties file to my .gitignore?
Do I need to add other files to the .gitignore, or configure swiper with a custom rule set?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants