Re: mr up not fetching repositories it should fetch
-=| gregor herrmann, 26.06.2022 23:44:28 +0200 |=-
> On Sun, 26 Jun 2022 23:37:42 +0300, Damyan Ivanov wrote:
>
> > $ stat .git/FETCH_HEAD
> > File: .git/FETCH_HEAD
> > Size: 2055 Blocks: 8 IO Block: 4096 regular file
> > Device: 2eh/46d Inode: 1037725 Links: 1
> > Access: (0644/-rw-r--r--) Uid: ( 1000/ dam) Gid: ( 1000/ dam)
> > Access: 2016-11-09 20:22:16.102958000 +0200
> > Modify: 2019-09-15 14:56:51.696968093 +0300
> > Change: 2021-11-04 15:42:45.072112725 +0200
> > Birth: 2021-11-04 15:42:45.072112725 +0200
>
> % stat .git/FETCH_HEAD
> File: .git/FETCH_HEAD
> Size: 2481 Blocks: 8 IO Block: 4096 regular file
> Device: fe03h/65027d Inode: 7291655 Links: 1
> Access: (0664/-rw-rw-r--) Uid: ( 1000/ gregoa) Gid: ( 1000/ gregoa)
> Access: 2021-01-31 08:30:28.390935982 +0100
> Modify: 2021-01-30 20:11:20.295060888 +0100
> Change: 2021-01-30 20:11:20.295060888 +0100
> Birth: 2021-01-30 00:06:18.427682314 +0100
>
> > compare-lastactivity looks at the ctime (i-node/metadata change time).
> > Perhaps it should look at the mtime (data change time)?
>
> That's an interesting idea. Maybe worth trying? :)
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.
What did help was to run 'gbp pull' over all repositories and note the
failing ones, fix them by hand or just remove them. Later 'mr up' does
the right thing. Took a lot of time, but at least now I can grep for
missing autopkgtests :)
-- Damyan
Reply to: