Re: help with git errors

2023-06-28 Thread Steven Robbins
On Wednesday, June 28, 2023 4:33:22 A.M. CDT olivier sallou wrote: > I think I fixed the issue. > > I deleted upstream/5.3.0 tag on remote , went to upstream branch, and > put tag again: Awesome, thanks so much!! I found that "gbp pull" initially failed on me. I had to delete my local tag ups

Re: help with git errors

2023-06-28 Thread olivier sallou
On Tue, 2023-06-27 at 12:59 -0500, Steven Robbins wrote: > Hello, > > I have a strange problem with Salsa's git repo for ITK.  Today I did > a fresh > clone and confirmed that it's not something I did locally.  I don't > understand > what the issue is and hoping someone here can help. > > After

Re: help with git errors

2023-06-27 Thread Étienne Mollier
Hello, Andreas Tille, on 2023-06-27: > Am Tue, Jun 27, 2023 at 09:54:19PM +0200 schrieb Étienne Mollier: > > I'm short of options that wouldn't involve a force push. > > If a forced push might be the solution its probably sensible to > go that road. I attempted a rebase to glue the history back

Re: help with git errors

2023-06-27 Thread Andreas Tille
Am Tue, Jun 27, 2023 at 09:54:19PM +0200 schrieb Étienne Mollier: > I'm short of options that wouldn't involve a force push. If a forced push might be the solution its probably sensible to go that road. > In any case, thanks for having pushed ITK 5.3.0! +1 Kind regards Andreas. -- http:

Re: help with git errors

2023-06-27 Thread Étienne Mollier
Hi Steve, > Am Tue, Jun 27, 2023 at 12:59:46PM -0500 schrieb Steven Robbins: > > steve@riemann:~/Packages/insighttoolkit/salsa$ gbp push > > gbp:info: Pushing debian/5.3.0-4 to origin > > gbp:info: Pushing upstream/5.3.0 to origin > > gbp:info: Pushing refs/heads/master to origin:refs/heads/master

Re: help with git errors

2023-06-27 Thread Andreas Tille
Hi, I admit I have no solution, but my attempt diff --git a/debian/changelog b/debian/changelog index 0e60fef3..ad73a613 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +insighttoolkit5 (5.3.0-5) UNRELEASED; urgency=medium + + * Team upload. + * Standards-Version: 4.6.2 +

help with git errors

2023-06-27 Thread Steven Robbins
Hello, I have a strange problem with Salsa's git repo for ITK. Today I did a fresh clone and confirmed that it's not something I did locally. I don't understand what the issue is and hoping someone here can help. After the clone, I did a simple change to the control file, built the source pa