We used to do arc land --hold to land a feature branch and prepare it for further processing (we use cascading model of branches to manage releases, which means the landed fix may end up being merged into further branches on the spot). If my feature branch was branched off of Release1 what used to happen after arc land --hold is that my local Release1 branch would be updated with the landed changes, such that if I then did
git checkout master git merge Release1
I could get my change propagated to master after it landed in Release1.
Similarly, if I had multiple changes I wanted to test together in Release1 after landing, I could do
git checkout feature1 arc land --hold git checkout feature2 arc land --hold
and the my new release branch updated with 2 landed commmits. It would also clean up my unneeded branches.
Now I see a new commit getting generated after the top of my release branch in a detached state. I then have to merge (fast-forward) that commit into my release branch to get behavior as before:
This local working copy now contains the merged changes in a detached state. You can push the changes manually with this command: $ git push -- origin 73afd6ce8b26ab764777a5a1e69a61fbfb237233:Release1 You can go back to how things were before you ran `arc land` with this command: $ git checkout radar/24471407 --
- What is the rationale behind this change
- Is there some configuration flag I can set to get the previous behavior back?