Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tg next returns the wrong next topic #23

Open
matttbe opened this issue Apr 26, 2022 · 0 comments
Open

tg next returns the wrong next topic #23

matttbe opened this issue Apr 26, 2022 · 0 comments

Comments

@matttbe
Copy link

matttbe commented Apr 26, 2022

Hello,

First, thank you for maintaining this great tool!

I have an issue with tg next returning a wrong topic: the returned topic is from another part of the tree.

My TopGit tree is mostly linear:

$ tg summary --rdeps-full t/DO-NOT-MERGE-git-markup-fixes-net-next
t/DO-NOT-MERGE-git-markup-fixes-net-next
  t/DO-NOT-MERGE-git-markup-net-next
    net-next
  t/DO-NOT-MERGE-git-markup-end-common-net-net-next
    (...)
            t/DO-NOT-MERGE-git-markup-net
              net

Or:

              t/upstream                                     t/upstream-net
                   ↓                                                ↓
                 (...)                                            (...)
                   ↓                                                ↓
t/DO-NOT-MERGE-git-markup-fixes-net-next  →  t/DO-NOT-MERGE-git-markup-end-common-net-net-next
                   ↓                                                ↓
  t/DO-NOT-MERGE-git-markup-net-next                              (...)
                   ↓                                                ↓
                net-next                              t/DO-NOT-MERGE-git-markup-net
                                                                    ↓
                                                                   net

Here is the issue:

$ git checkout t/DO-NOT-MERGE-git-markup-net-next
$ tg next
t/DO-NOT-MERGE-git-markup-net

If I insert another topic between t/DO-NOT-MERGE-git-markup-net-next and t/DO-NOT-MERGE-git-markup-fixes-net-next, it is only from this topic I have an issue and t/DO-NOT-MERGE-git-markup-net is returned.

Here is the output of sh -x /usr/bin/tg next 2>&1 | sed "s#${PWD}#/PWD#g" > tg-next.log (my PWD is very long, I reduced it): tg-next.log

You can easily experiment this issue because my repo is public: https://github.com/multipath-tcp/mptcp_net-next/

matttbe added a commit to multipath-tcp/mptcp_net-next that referenced this issue May 5, 2022
tg annihilate was not jumping to the next topic causing some issues in
the dependences. But in fact, 'tg next' was also having the same issue.

Instead, a manual 'tg next' is done with a workaround.

Link: mackyle/topgit#23
Signed-off-by: Matthieu Baerts <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant