Details
-
Suggestion
-
Resolution: Unresolved
-
None
-
None
-
FE/Crucible 2.7.11 running standalone on Debian 6.0.4
-
28
-
Description
When we merge from one branch to another, git adds a "merge commit" to record the merge. This commit will only directly contain changes that were made to resolve merge conflicts (if any), but it will also reference the commits that were merged from one branch to another.
Fisheye however, doesn't show any of the commits that were merged into the new branch as part of the merge operation. Not only is this a bit rubbish when trying to view the repository, it also makes it very difficult to create a Crucible review for the merge.
In the end, I worked around it by using git show -m HASH to produce a diff including all the merged commits (if git CLI can do it, then Fisheye should be able to!), and uploaded this to Crucible manually.
Attachments
Issue Links
- causes
-
JSWCLOUD-13937 the "no unreviewed changesets" condition blocks transition when there is a unreviewable merge commit that contains JIRA issue id
-
- Closed
-
-
-
- Closed
-
- is duplicated by
-
-
- Closed
-
-
-
- Closed
-
- mentioned in
-
Page Loading...
-
-
-
-
-
-