[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: mr up not fetching repositories it should fetch



-=| gregor herrmann, 01.07.2022 01:10:43 +0200 |=-
> On Mon, 27 Jun 2022 22:19:19 +0300, Damyan Ivanov wrote:
> 
> > Tried that and it doesn't solve the problem. I think I discovered how 
> > this happened.
> > When there are local changes that aren't committed, gbp pull (run by 
> > mr up) will fetch, updating .git/FETCH_HEAD, but the merge will fail. 
> > This leaves the repository in an old state, behind salsa.
> 
> As a side note: How are you running mr?

 mr -j6 up

and then looking to another terminal while it runs.

And more often that not 'mr up -j6' which starts to when individual 
repositories get pulled :)

> While playing with dpt-salsa and running mr to check affects, I
> noticed that I always end up in a shell -- because, as I noiticed
> later -- my shell history leads me to run `mr -i -j8 up', and the -i
> tells me that there is a problem.

Oh, thanks! I didn't know about '-i'. Adding it spawns a shell in any 
failing repository so that any issues can be fixed right away. Very 
handy and helps avoiding the original issue.


-- Damyan


Reply to: