History build coused by changes on different branch
Hi Folks,
I wonder why, when I created new branch, new builds marked in italic appeared in history build of this new branch. These builds (history builds) contain changes of commits which were on default branch, and were added before new branch was created. TC linked these commits with my default branch and new branch - I don't know why. They located simultaneously on both.
Can I have problem with my config? For e.g with VCS? I haven't got triggers.
Please sign in to leave a comment.
Hello Jaroslaw,
Which VCS are you using? Which TeamCity version do you have?
We use TC 10.0.1 with Mercurial. Commits are mirrored. Suppose that I marge my default branch with feature_1 branch. Then I switch to feature_1 and add new commit - "something". After that build with change "something" occurs on feature_1 and default branches - on feature_1 as change on feature_1 and on default as change on default. I added it after marge so I don't know why it exists simultaneously on default and feature_1.
Hello Jaroslaw,
Could you please show, where and how do you see that the change committed into one feature_1 branch belongs to both default and feature_1 branches at the same time, e.g. attach a screenshot of
<YourProject> | <YourBuild> | Change Log
<YourProject> | <YourBuild> | Overview
Administration | <Root project> | <YourProject> | <YourBuild> | Edit Build Configuration | Edit VCS Root pages?
It's depends on when I publish my local changes - if I publish my changes with merge commit, changes occure only on default. When I publish each commits separately, they occur on each branch.
When I merge two feature branches: if I publish my changes with merge commit, changes occure on each branch. When I publish each commits separately, changes occur also on branch to which I merged.
Can I configure my TC in that way, that changes occur only on branch on which they were added, and on brach to which I marged occur only "merge commit"?
Hello Jaroslaw,
There are no history builds on your Overview screenshot - History Builds should be marked italic.
Could you please explore your Build History on <YourProject> | <YourBuild> | History and attach a screenshot with History Builds, if any?
And one more question to you to clarify your case.
You write, that you do not have triggers. Who triggers your build then? When and how does it happen?
You may also take a look on TeamCity documentation about Triggering a Build on Branch Merge.