Default log revset without conflicted change from others

[bboissin]

I really like the default log, my only issue is that whenever other people push conflicted changes on their branch (we're using gitlab), it pollutes the log.

Is there a way to only show the conflicted change I own by default?

I tried building my own revset but couldn't really reproduce the default one easily.

[PhilipMetzger]

you need to add the clause ~ (conflicted() ~mine()) to the default revset which roughly translates "without all conflicted commits which aren't mine". You also can find the default log revset here https://jj-vcs.github.io/jj/latest/config/#log

[bboissin]

Thanks! I think something similar probably works. But after further investigation I think my problem is more involved (those conflicts are not supposed to happen in the first place and that's what I probably need to fix).

(see other reply)

[jennings]

The default log revset shouldn't show other branches at all unless you start tracking the remote bookmark. Did you enable git.auto-local-bookmark? If so, maybe you want to disable that?

I'm also a little confused about how other people are pushing conflicts. Git doesn't record conflicts in commits, they have to be resolved before committing. Is it possible you're seeing divergent changes? Do you see the word "conflict" or the symbol "??" in your log output?

[bboissin]

[sorry I can't just copy paste the logs/etc. since the repo is in some closed off corp environment...]

The default log revset shouldn't show other branches at all unless you start tracking the remote bookmark. Did you enable git.auto-local-bookmark? If so, maybe you want to disable that?

I don't have this enabled.

Do you see the word "conflict" or the symbol "??" in your log output?

So I've spent a bit more time on this yesterday. Some branches are just conflict, and some have both divergent changes and conflicts.

The top of those branch doesn't have a bookmark or anything.

For the conflicted+divergent changes, the other commit are non-conflicted revision in trunk().

For the branch which is just conflicted, I have no idea where it comes from. I checked and they do have conflict markers.

I pinged the authors of those commits and none of them are using jj. I would be extremely surprised if I created the extra changes myself intentionally (my workflow is pretty simple, just rebasing my own change and pushing a branch upstream to create PRs).

What I ended up doing:

• abandon the conflicted+divergent changes (seemed safe since they're in trunk() anyway)
• didn't touch the "just conflicted" changes, I probably need to investigate more (as a mercurial refugee, I don't fully understand git/jj interactions so I'm slightly afraid of abandoning non divergent changes that I don't own, but I suspect since there's no bookmark on the branch I shouldn't be able to impact the remote git on future pushes?)

I'll make sure to pay more attention next time it happens (this is really weird that it shows up like that, that said I think I also sometimes have weird interactions between CLI and the jjk plugin on vscode). What's the most useful thing to check, op log on the first conflicted change?