WesleySmith
New Member
I was wondering if anyone else is using Mercurial as their version control system and could give me some advice.
We have noticed that when you open and save a window created using the AppBuilder the frame definitions change sequence in the file - even if you don't make any changes to the procedure and/or the field definitions in a frame move. These then get picked up by Mercurial as a change set including any changes we have also made.
For the most part this does not cause too much of a problem because you can simply commit and push your changes. However, this behaviour does cause some problems if you need to merge two files and the definitions have moved. Mercurial does attempt to resolve the merge but if a conflict occurs it pops you into KDiff3 to resolve manually and this can become very time consuming determining what should/shouldn't be included in the output from the merge.
I have spoken to Progress who investigated the frame definition sequence moving in the hope that there was a setting which would "fix" the definitions and stop them moving. The impression I got was they were suprised the definitions moved (They replicated the problem) but advised that there was no intention in resolving it at the moment because it has been like this for a number of releases. They also confirmed there was no setting to "fix" the definitions.
So, this got me wondering... Surely others must be experiencing this problem, and how do they handle this.
Does anyone have any advise/tips on this?
We have noticed that when you open and save a window created using the AppBuilder the frame definitions change sequence in the file - even if you don't make any changes to the procedure and/or the field definitions in a frame move. These then get picked up by Mercurial as a change set including any changes we have also made.
For the most part this does not cause too much of a problem because you can simply commit and push your changes. However, this behaviour does cause some problems if you need to merge two files and the definitions have moved. Mercurial does attempt to resolve the merge but if a conflict occurs it pops you into KDiff3 to resolve manually and this can become very time consuming determining what should/shouldn't be included in the output from the merge.
I have spoken to Progress who investigated the frame definition sequence moving in the hope that there was a setting which would "fix" the definitions and stop them moving. The impression I got was they were suprised the definitions moved (They replicated the problem) but advised that there was no intention in resolving it at the moment because it has been like this for a number of releases. They also confirmed there was no setting to "fix" the definitions.
So, this got me wondering... Surely others must be experiencing this problem, and how do they handle this.
Does anyone have any advise/tips on this?