Skip to content

Commit

Permalink
WIP notes on branches
Browse files Browse the repository at this point in the history
  • Loading branch information
ja-openai committed Sep 13, 2024
1 parent f5f442f commit c0359ea
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ MultiBranchState updateAssetExtractionWithState(
multiBranchStateMerger.merge(
currentState,
baseState,
// need main here in some case
ImmutableSet.of(PRIMARY_BRANCH, NULL_BRANCH_TEXT_PLACEHOLDER));

Modifications modifications = getModifications(baseState, newState);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ CompletableFuture<PollableFuture<Void>> scheduleBranchNotification(Branch branch
* @return
*/
List<Branch> getBranchesToProcess(Long repositoryId) {
// also need for main
List<Branch> branches =
branchRepository.findByRepositoryIdAndDeletedFalseAndNameNotNullAndNameNot(
repositoryId, PRIMARY_BRANCH);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ public void testEscaping() throws Exception {
</resources>
""";

System.out.println(result);

source = new AndroidStringDocument();
source.addSingular(
new AndroidSingular(120L, "a_href", "with a <a href=\"http://test.org\"> link</a>.", ""));
Expand Down

0 comments on commit c0359ea

Please sign in to comment.