How does the megamerge handle the case where two included branches overlap in changes and a new commit is made that applies to the overlap?

▲ icorbrey 2 days ago | parent | next [-]

This is something you have to generally handle manually since absorb won't squash hunks with ambiguous targets, but I typically stack these branches and accept the dependency. I have had instances where this has backfired a little bit re: ordering but thankfully with JJ and the very patient little man in my computer named Codex it's easy to reorder them and end up with the same diff

▲ nvahalik 2 days ago | parent | prev [-]

The mega merge wouldn't handle that based on the way the article shows. You COULD have a revset that includes stacked changes, though. That does work and is what I currently do.

▲ nchmy 2 days ago | parent [-]

Could you please elaborate on how you do this?

▲ nvahalik 2 days ago | parent [-]

If you have a dependency tree like this:

       / A \
      -- B - Megamerge 
       \ C /

There is nothing stopping you from doing this:

       / A - D \
      -- B ----- - Megamerge 
       \ C - E /

(Edit, or even this:)

       / A - D \
      -- B ----- - Megamerge 
       \ C ----/
          \ E /

Where E stacks on C and D stacks atop A. In the case above, A-E are revsets of either 1 or more commits. JJ doesn't care if they are or not. You'd generally bookmark the revset on the final "commit" as the pointer.

           / features/add-widgets
          /  / features/add-widget-integration
       / A - D \
      -- B ----- - Megamerge 
       \ C - E /
          \   \ feature/add-new-page
           \ feature/rework-navigation

In the example above, let's say you rework the navigation. You could have it exist alongside the navigation rework, but changes are you don't want to do the work twice. You just say "hey, this depends on the nav rework" and so it's there inside of the repo.

The thing is there is another way to do this where you end up with 4 different parents in a megamerge and your nav rework touches the megamerge and your new page is yet another revset is just a fork off of it. But yeah... JJ gives you a lot of flexibility in this manner.

	▲	nchmy a day ago \| parent [-]
		Thanks!