Skip to content

absorb issues #11096

@schacon

Description

@schacon

I tried to create three file changes that were locked to three different branches and absorb bailed.

❯ but stf                                                                              
╭┄00 [Unassigned Changes]
┊   nx M Gemfile 🔒 427019e
┊   hw M t.md
┊
┊╭┄t6 [sc-branch-29]
┊●   af31a03 worktree change v1
┊│     ww M README.md
┊│     wr A test.md
┊│     hy M test/test_helper.rb
┊│
┊├┄nd [user-bookmarks]
┊●   427019e amaing
┊│     x5 M Gemfile
┊│     gd A app/controllers/bookmarks_controller.rb
┊│     n4 A app/models/bookmark.rb
┊│     qa M app/models/user.rb
┊│     hl A app/views/bookmarks/index.html.erb
┊│     px M config/routes.rb
├╯
┊
┊╭┄h4 [user-changes]
┊●   3fb0e35 testing commit
┊│     ru A t.md
├╯
┊
● 204e309 (common base) [origin/main] 2025-07-06 08:10:34 +0200 Merge pull request #10 from schacon/sc-description

Sorry, missing one of the changes in the output here, but I also edited the README.md. Then I tried to absorb, thinking it would amend all three commits. It looks like it did one and then found itself in an unexpected state.

❯ but absorb
Absorbed changes into commit 427019e
Error: Branch tip at a4d45a392d26d2c02e6ee0897312bf5962415b7e didn't contain the affected commit af31a0312dc2d90d75e516e5224ba564844e0e08 - cannot rebase

❯ but st
╭┄00 [Unassigned Changes]
┊   ve M README.md
┊   hw M t.md
┊
┊╭┄t6 [sc-branch-29]
┊●   a4d45a3 worktree change v1
┊│
┊├┄nd [user-bookmarks]
┊●   5c7faa7 amaing
├╯
┊
┊╭┄h4 [user-changes]
┊●   3fb0e35 testing commit
├╯
┊
● 204e309 (common base) [origin/main] 2025-07-06 08:10:34 +0200 Merge pull request #10 from schacon/sc-description

It looks like maybe it made the absorb decisions first, then tried to do multiple absorbs, but a rebase changed a commit before it could be amended.

Metadata

Metadata

Assignees

Labels

CLIThe command-line program `but`

Projects

Status

Todo

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions