Adding parents to merges

[sullyj3]

suppose I have a merge revision m, with parents p1, p2.. pn. Is there any better way of giving m an additional parent x than this?

jj rebase -s m -d 'all:p1|p2|..|pn|x'

[thoughtpolice]

jj rebase -s m -d 'all:m-' -d ... and repeat -d ... for as many different revisions as you want.

[thoughtpolice]

And if you set ui.always-allow-large-revsets = true then you can remove the all: prefix too, for jj rebase -s m -d 'm-' -d ...

[sullyj3]

The minus!!! Of course! But I think you could even do jj rebase -s m -d 'all:m-|x'. OTOH your version seems more aliasable.

[sullyj3]

That's a good tip about the config as well, thanks. I'm a little confused by that default. It feels discordant to require you to jump through hoops to use revsets when they're such a signature feature of jj.

[thoughtpolice]

It's a bit vestigial and was mostly meant as an anti-footgun measure in the past (you could always specify multiple -ds without needing any flags) but there's been some talk in recent memory of just removing it entirely. So it might go away soon.

[ilyagr]

See also #6016.