Change conflict in patch 0005 for v1.23.2

bartvdbraak · bartvdbraak · commit 4688297cfa5f · 2025-02-13T14:17:17.000+01:00
diff --git a/patches/0001-BLENDER-Blender-ID-goth-provider.patch b/patches/0001-BLENDER-Blender-ID-goth-provider.patch
@@ -1,4 +1,4 @@
-From 8b5a296990a67b35b5fcd9047d79418e31b37f60 Mon Sep 17 00:00:00 2001
+From 15a25804e98da3c122082c62d16b2d1ce4374eb9 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:28:51 +0200
 Subject: [PATCH 01/14] BLENDER: Blender ID goth provider
@@ -25,10 +25,10 @@ Provider authored by Matti Ranta and Arnd Marijnissen.
  create mode 100644 services/auth/source/oauth2/blenderid/session_test.go
 
 diff --git a/go.mod b/go.mod
-index d8e7e37152..af00e05199 100644
+index 422952af9e..98a7954b3c 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -258,6 +258,7 @@ require (
+@@ -257,6 +257,7 @@ require (
  	github.com/mmcloughlin/avo v0.6.0 // indirect
  	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -37,10 +37,10 @@ index d8e7e37152..af00e05199 100644
  	github.com/mschoch/smat v0.2.0 // indirect
  	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 diff --git a/go.sum b/go.sum
-index 968001e7f9..bce9ba2fd7 100644
+index e7f6b7c6d9..4b8b54d3fc 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -590,6 +590,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
+@@ -588,6 +588,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
  github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
  github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
@@ -593,5 +593,5 @@ index 65cf538ad7..f6f49ada04 100644
 +		}))
  }
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0002-BLENDER-Show-warning-for-target-branch-switching.patch b/patches/0002-BLENDER-Show-warning-for-target-branch-switching.patch
@@ -1,14 +1,14 @@
-From 651978e123b0f0caf5dfe0dbff1bb0cfad9273ea Mon Sep 17 00:00:00 2001
+From 1b1e8781449eef734dbd5addd81be079436db600 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:31:35 +0200
-Subject: [PATCH] BLENDER: Show warning for target branch switching
+Subject: [PATCH 02/14] BLENDER: Show warning for target branch switching
 
 ---
  templates/repo/issue/view_title.tmpl | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
-index bf2ede58e4..a0cade5cc9 100644
+index 7bb00ff9a9..19a4331883 100644
 --- a/templates/repo/issue/view_title.tmpl
 +++ b/templates/repo/issue/view_title.tmpl
 @@ -118,6 +118,7 @@
diff --git a/patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch b/patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch
@@ -1,4 +1,4 @@
-From 37d72a57067e955cdc886ddd527a55c371b01bde Mon Sep 17 00:00:00 2001
+From 4cf49edf4de94065e9ad6e24c4482c2054d6eece Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:32:53 +0200
 Subject: [PATCH 03/14] BLENDER: Workaround LFS files not being available in
@@ -25,10 +25,10 @@ index bb6361050a..83a2e7883d 100644
  		return count > 0, err
  	}
 diff --git a/services/lfs/server.go b/services/lfs/server.go
-index a77623fdc1..c45c1937ec 100644
+index c4866edaab..1fa2b7a67f 100644
 --- a/services/lfs/server.go
 +++ b/services/lfs/server.go
-@@ -251,6 +251,26 @@ func BatchHandler(ctx *context.Context) {
+@@ -253,6 +253,26 @@ func BatchHandler(ctx *context.Context) {
  			responseObject = buildObjectResponse(rc, p, false, !exists, err)
  		} else {
  			var err *lfs_module.ObjectError
@@ -56,5 +56,5 @@ index a77623fdc1..c45c1937ec 100644
  				err = &lfs_module.ObjectError{
  					Code:    http.StatusNotFound,
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch b/patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch
@@ -1,4 +1,4 @@
-From ff4fd9166ac3c8cc099ab35968e23096ec0525a4 Mon Sep 17 00:00:00 2001
+From f30536bba66c393e59822cbd9c194017d174a3b5 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:33:32 +0200
 Subject: [PATCH 04/14] BLENDER: Don't allow assigning large teams as reviewers
@@ -66,5 +66,5 @@ index bf0d8cb298..c3b0858aa3 100644
 +	return organization.FilterLargeTeams(organization.GetTeamsWithAccessToRepoUnit(ctx, repo.OwnerID, repo.ID, perm.AccessModeRead, unit.TypePullRequests))
  }
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0005-BLENDER-Support-both-exclusive-and-non-exclusive-sco.patch b/patches/0005-BLENDER-Support-both-exclusive-and-non-exclusive-sco.patch
@@ -1,4 +1,4 @@
-From 6d833f20e2bff71d1a7bce47a934700fdfc15738 Mon Sep 17 00:00:00 2001
+From b7ab7d82754fd5d7ea154d31f991a5da206d96a1 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:58:05 +0200
 Subject: [PATCH 05/14] BLENDER: Support both exclusive and non-exclusive scope
@@ -113,13 +113,13 @@ index 88e2e43120..ee569b4fd0 100644
  				{{ctx.RenderUtils.RenderLabel .}}
  				<p class="tw-ml-auto">{{template "repo/issue/labels/label_archived" .}}</p>
 diff --git a/templates/repo/issue/sidebar/label_list.tmpl b/templates/repo/issue/sidebar/label_list.tmpl
-index 9dd83ba188..124e3a1bc6 100644
+index 9b6195a8f4..c8310203c4 100644
 --- a/templates/repo/issue/sidebar/label_list.tmpl
 +++ b/templates/repo/issue/sidebar/label_list.tmpl
-@@ -18,23 +18,25 @@
- 				</div>
- 				<a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
+@@ -19,23 +19,25 @@
  				<div class="scrolling menu">
+ 					<a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
+ 					<div class="divider"></div>
 -					{{$previousExclusiveScope := "_no_scope"}}
 +					{{$previousScope := "_no_scope"}}
  					{{range $data.RepoLabels}}
@@ -149,5 +149,5 @@ index 9dd83ba188..124e3a1bc6 100644
  					{{end}}
  				</div>
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0006-BLENDER-Projects-button-to-show-hide-issue-details-a.patch b/patches/0006-BLENDER-Projects-button-to-show-hide-issue-details-a.patch
@@ -1,4 +1,4 @@
-From a8bb08c1c1448a97edc5f1c49a9505d66ca4eaf0 Mon Sep 17 00:00:00 2001
+From fd09d4851658310327e2e110e16963226fdd5954 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:00:36 +0200
 Subject: [PATCH 06/14] BLENDER: Projects: button to show/hide issue details
@@ -181,5 +181,5 @@ index fb832bd05a..4fb9b42f46 100644
 +  margin-left: 0.5em;
  }
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0007-BLENDER-Lazy-pull-request-checking.patch b/patches/0007-BLENDER-Lazy-pull-request-checking.patch
@@ -1,4 +1,4 @@
-From 1c064f69e3a3aa1969b24ec12b99ac150fd8533a Mon Sep 17 00:00:00 2001
+From b22cd3a41db335712186cb1bf4c57b9e96ac0dee Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:02:04 +0200
 Subject: [PATCH 07/14] BLENDER: Lazy pull request checking
@@ -131,5 +131,5 @@ index 98bd28a4a5..87a5d40f7c 100644
  	})
  }
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0008-BLENDER-Remember-login-for-OAuth-Blender-ID.patch b/patches/0008-BLENDER-Remember-login-for-OAuth-Blender-ID.patch
@@ -1,4 +1,4 @@
-From 35f8ad0fce06ac0aee3d54b8e46987f0cdd4b4ba Mon Sep 17 00:00:00 2001
+From 91fecdeb64112cfbf99eea85a9c87739863a476c Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:04:02 +0200
 Subject: [PATCH 08/14] BLENDER: Remember login for OAuth / Blender ID
@@ -41,5 +41,5 @@ index 75f94de0ed..5b58bc6337 100644
  		ctx.Csrf.PrepareForSessionUser(ctx)
  
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0009-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch b/patches/0009-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch
@@ -1,4 +1,4 @@
-From 4446aa850393d32df9c8ce9964d9aa087ad621f2 Mon Sep 17 00:00:00 2001
+From c91d42fa91177ce42cd01aee0e1d09d26f8dda47 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:04:49 +0200
 Subject: [PATCH 09/14] BLENDER: Always login with Blender ID, unless
@@ -51,5 +51,5 @@ index 8ddb9730c3..99c423e782 100644
  		RedirectAfterLogin(ctx)
  		return
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0010-BLENDER-Allow-non-local-users-to-be-renamed.patch b/patches/0010-BLENDER-Allow-non-local-users-to-be-renamed.patch
@@ -1,4 +1,4 @@
-From 6092a3d4ea521ab4c3fe67a0c263877a14ef3d3d Mon Sep 17 00:00:00 2001
+From 285a38894bb72c74881bf66cf5ecc75d634fa280 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:05:47 +0200
 Subject: [PATCH 10/14] BLENDER: Allow non-local users to be renamed
@@ -33,5 +33,5 @@ index 7bde642412..5dda32f708 100644
  	if err := user_model.IsUsableUsername(newUserName); err != nil {
  		return err
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0011-BLENDER-Workaround-internal-server-error-comparing-b.patch b/patches/0011-BLENDER-Workaround-internal-server-error-comparing-b.patch
@@ -1,4 +1,4 @@
-From d805961515eb2dfdab26bc32b4952cae13e04f82 Mon Sep 17 00:00:00 2001
+From f0298ae745baf28da6fa2c7904709547eacaacfa Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:07:25 +0200
 Subject: [PATCH 11/14] BLENDER: Workaround internal server error comparing
@@ -30,5 +30,5 @@ index 16fcdcf4c8..91d61d2158 100644
  	}
  
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0012-BLENDER-Prefer-creating-PR-for-base-disable-editing-.patch b/patches/0012-BLENDER-Prefer-creating-PR-for-base-disable-editing-.patch
@@ -1,4 +1,4 @@
-From 86cfd732195d8ccf7168d4d8a20d08b74530afdb Mon Sep 17 00:00:00 2001
+From 207b6997764955732f8292e079dea0b2e14c3714 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:09:11 +0200
 Subject: [PATCH 12/14] BLENDER: Prefer creating PR for base, disable editing
@@ -70,5 +70,5 @@ index c050324e93..57b3a2f6f1 100644
  				<div class="field">
  					<div class="ui radio checkbox">
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0013-BLENDER-Add-docs-explaining-merge-strategy.patch b/patches/0013-BLENDER-Add-docs-explaining-merge-strategy.patch
@@ -1,4 +1,4 @@
-From ccc7e36651049cb08ab4161d1c2f5d23e90ff807 Mon Sep 17 00:00:00 2001
+From 7aa2069c44ea862ddb68b4dce4ed52fcf866b486 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:58:32 +0200
 Subject: [PATCH 13/14] BLENDER: Add docs explaining merge strategy
@@ -27,5 +27,5 @@ index 0000000000..f5bd495d5e
 +First do changes in `blender-merged-develop`, and deploy on uatest. Then apply
 +the changes in `blender-merged` and deploy in production.
 -- 
-2.45.2
+2.47.1
 
diff --git a/patches/0014-BLENDER-Add-Python-for-external-renderering.patch b/patches/0014-BLENDER-Add-Python-for-external-renderering.patch
@@ -1,4 +1,4 @@
-From bddc099311884b829bf51196a3c2e3852a934cc1 Mon Sep 17 00:00:00 2001
+From e1e63508813a2a4d67e029a5c07b32a9442fed20 Mon Sep 17 00:00:00 2001
 From: Bart van der Braak <bart@blender.org>
 Date: Wed, 4 Dec 2024 15:29:10 +0100
 Subject: [PATCH 14/14] BLENDER: Add Python for external renderering
@@ -27,5 +27,5 @@ index be6f125104..1032790dd0 100644
      -S -g 1000 \
      git && \
 -- 
-2.45.2
+2.47.1
 
