Re: pkgsrc and git

[Thomas Klausner <wiz%gatalith.at@localhost>]

On Fri, Jul 18, 2025 at 03:38:12PM +0000, John Klos wrote:
> Hi,
> 
> Since we're finally moving, it'd be good to learn what to do when things
> fail.
> 
> Can someone tell me what's going on here? I used git to fetch pkgsrc-wip.
> I've updated it now and then with "git pull". The last update was a month
> ago.
> 
> Now I get:
> 
> remote: Enumerating objects: 319, done.
> remote: Counting objects: 100% (319/319), done.
> remote: Compressing objects: 100% (232/232), done.
> remote: Total 233 (delta 113), reused 8 (delta 0), pack-reused 0 (from 0)
> Receiving objects: 100% (233/233), 191.04 KiB | 118.00 KiB/s, done.
> Resolving deltas: 100% (113/113), completed with 58 local objects.
> From git://wip.pkgsrc.org/pkgsrc-wip
>    f52b75d2f..366e7adbc  master     -> origin/master
> Updating 478d3b3ce..366e7adbc
> error: The following untracked working tree files would be overwritten by
> merge:
> 	0ad-data/COMMIT_MSG
> ...
> 125 more lines
> ...
> Aborting

My first guess is that there was some corruption in your checkout.

The error message is clear: it says that 0ad-data/COMMIT_MSG in your
version of the repository is untracked (i.e. not part of the git
repository, a new file), but that the changes you pulled from the
server include a file at that location, and that the new file would
overwrite your unknown one.

In case you were really adding this locally while it was added
upstream, you'd need to either move it aside, or commit it locally and
merge the changes from upstream with yours.

> At some point a good CVS -> git cheat sheet would be good, including
> covering problems and errors.

cjep started a document for after the conversion:

https://wiki.netbsd.org/users/cjep/git4pkgsrc/

but the server details are of course not filled in yet, since we
haven't switched.
 Thomas