UpperParks - Version Control - Sequence of events

I wanted to confirm that this is the proper order of events to make sure Clarion, Version Control (.git/.svn/etc), and UpperParks work well together.

How I work on projects with the UpperPark interface:
1. Before I pull, I export my APP's to APV and commit.
2. I fetch-pull (merge) .git for the APVs and the other source files.
3. I import the APVs of the apps that changed, so my APP contain new changes and my own changes.
4. I compile to make sure everything is ok
5. I export the APP's APVs again (the merged version, my changes and any new ones)
6. I commit and push that merged APV so others get my changes.

@Rick_UpperPark

Hi Kevin -

I would highly recommend incorporating branches and pull requests to your work flow as well.

At minimum, a branch that you work in, and the main branch that you don't.

You would merge your work branch into main when you've reviewed it and are satisfied with it. That would be done by pull request if you have a team. I use pull requests on my personal work too.

I don't know about the UpperPark stuff so much, but I do fervently recommend do the the branch and pull request. You won't regret it.

Agree with Jeff on branches. One thing I'd change in your list is step 5. The APVs you pulled are already in git exactly as your colleagues committed them, so exporting them again only adds Clarion's own noise (reordering, filled-in defaults, template differences between machines) as changes nobody made. If everyone does that, every pull adds a commit of noise and the real changes get buried.

How I work with Rick's tool:

  • A local branch for my work (branched off the feature branch, if there is one).
  • Work a little at a time, export, and commit only the APVs I know I changed.
  • Merge the team's work into my branch as I go, and import the APVs that came in. Those don't go back out to git.
  • When the feature is done, merge it back to master.

Two other points: resolve any conflicts in the APV text before importing (never import a file with conflict markers), and don't edit in the IDE between exporting and importing, or the import overwrites it.

It does depend on everyone working the same way. One person committing full re-exports and everyone's diffs fill with noise. It's the Clarion tax, unfortunately.

Actually, after the pull, my APVs contain the merged APV of what was local to my machine and their APV contribution (if working on the same code) so i have to pull that into my APP, the only reason I reexport the APV after compile is as a chekpoint. Technically I could just push right after pulling since my local APVs have the fully merged changes (They may not compile - that is why I import/compile/expost/push)