Support rebasing local changes on top of master/incoming changes #6662
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ffanK/pull-merge-rebase
…ffanK/pull-merge-rebase
…ffanK/pull-merge-rebase
…ffanK/pull-merge-rebase
…ffanK/pull-merge-rebase
…twinjs-core into affanK/pull-merge-rebase
rschili
reviewed
Jun 28, 2024
|
|
||
| assert.strictEqual(1, getCount(briefcases[3], PhysicalModel.classFullName)); | ||
| assertTxnStates(txns[3], false, false, false, false, true, "briefcase 3 after pull"); | ||
| // TODO: "redo possible" should be false, if we try to reinstate, it will crash! |
There was a problem hiding this comment.
This is currently a bug it seems. "IsRedoPossible" should be false (at least for merge.
Calling ReinstateTxn() after this crashes node.
rschili
reviewed
Jun 28, 2024
| // [3] model gets unsaved changes | ||
| IModelTestUtils.createAndInsertPhysicalPartitionAndModel(briefcases[3], IModelTestUtils.getUniqueModelCode(briefcases[3], "localPhysicalModel"), false); | ||
| assertTxnStates(txns[3], true, true, false, false, false, "briefcase 3 with unsaved local changes"); | ||
| await assertThrowsAsync(async () => briefcases[3].pullChanges(), "cannot processed due to unsaved changes."); |
There was a problem hiding this comment.
should be "cannot be processed due to unsaved changes"
I did not find the string both in itwin and imodel-native....
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
_onRebaseBeginLocalTxn()onRebaseEndLocalTxn()imodel-native:iTwin/imodel-native#737