youngmon/atlassian-qna huggingface dataset:
Issue with Bitbucket PR: Viewing Unwanted Changes from Base Branch
Asked by Hakeem Ishak:

Hello everyone,

I'm encountering a problem with pull requests (PR) on Bitbucket and I'm hoping to get some insights or solutions from the community.

Here's the scenario:

* I have a branch named `feature-1` and I want to create a pull request to merge it into the `development` branch.
* Ideally, when I open the PR from `feature-1` to `development`, I should only see the new changes introduced in `feature-1` that are not yet in `development`.
* However, Bitbucket's UI is showing changes from the `development` branch that `feature-1` is behind on. This clutters the PR view and makes it hard to review the actual changes from `feature-1`.

Additionally, I cannot merge the `development` branch into `feature-1` because `development` contains code from other features that are not needed in `feature-1` and could cause conflicts or complications.

Has anyone else faced a similar issue? Is there a workaround or a proper way to configure the PR so that only the new changes from `feature-1` are shown?

Any help or suggestions would be greatly appreciated!

Thanks in advance.


Answers:
author: Theodora Boudale
body: Hi [@Hakeem Ishak](/t5/user/viewprofilepage/user-id/5530527) and welcome to the community!

Pull request diffs In Bitbucket Cloud are using a three-dot diff. A three-dot diff shows only changes in the source branch starting at a common ancestor of the two branches. You can read more info on this blog post:

* <https://bitbucket.org/blog/improving-performance-on-complex-diffs>

Changes in the destination branch are not taken into account in this type of diff.

The only way to take into account the destination branch's changes in Bitbucket's PR diff is by merging the destination branch into the source branch or rebasing.

We have a feature request to show the preview-merge diff on demand (that would take into account changes in the destination branch):

* <https://jira.atlassian.com/browse/BCLOUD-21964>

You can add your vote there to express your interest, and you can also add yourself as a watcher if you'd like to get notified via email on updates.

Kind regards,  
Theodora

comments: author: Hakeem Ishak
body: Noted, thanks Theodora.


author: Theodora Boudale
body: You are very welcome. Please feel free to reach out if you ever need anything else.


Tags: bitbucket-cloud

cloud

pull-request
Lost Access to Account
Asked by jack:

I had an account which used an e-mail address to login.

I forgot, or lost, the previous password. I attempted to reset the password.

For whatever reason, the password reset e-mails never reached my inbox.

Out of desperation, I tested whether or not logging in with my Google account would let me in.

It let me in, only to an empty workspace, however straight after, ironically, I received an e-mail from Atlassian.

It said:

One of the confirmed email addresses (REDACTED) associated with **\[REDACTED\]** was removed because someone else verified ownership of the address on a different account. If you did not make this change, please email [support@bitbucket.org](mailto:support@bitbucket.org).

I have contacted the e-mail address above but I am now panicking and worried that my repositories are lost.

If anyone can help, or at least calm my soul, it would be much appreciated.

Thanks


Answers:
author: Mark C
body: Hi [@jack](/t5/user/viewprofilepage/user-id/5530748)  

Welcome to the community.  

I can confirm that your repositories are still there; however, the primary email address is different from the one you're currently using.  

You'll just need to use the correct email address to access your Bitbucket Cloud account.  

Could you try another email address to log in to [bitbucket.org](https://bitbucket.org/)?  

<br />

Regards,  
Mark C

comments: author: jack
body: Hi Mark,

Thank you so much for the response!

As far as I can remember, there have only ever been two e-mail addresses for this account.

The older one, (company name)ltd.co.uk I still have the e-mail address for, but if I attempt to do a reset password on that one it says the account doesn't exist (which is correct - I changed it when we moved to a new domain).

The newer one, (company name).co is the correct e-mail address. This is the account I'm having trouble accessing.

This is also the e-mail address used when I tried to login using Google.

If there is another e-mail address in use on this account I don't recall what it could be?

Thanks

Jack


author: Mark C
body: Hi [@jack](/t5/user/viewprofilepage/user-id/5530748) ,  

For us to investigate the issue further, I went ahead and created a support ticket for you.  

You should receive an email notification regarding the same.  

Regards,  
Mark C


author: jack
body: Anyone? Nobody? Bueller? Bueller?


Tags: bitbucket-cloud

cloud
What is the difference between Bitbucket and Git?
Asked by Farhad Yarian Koupaei:

What is the difference between Bitbucket and Git?


Answers:
author: Melo
body: Hi [@Farhad Yarian Koupaei](/t5/user/viewprofilepage/user-id/5530520) welcome to the community!

GIT is a version control technology, and Bitbucket is a repository hosting solution that integrates/leverages Git.

I would suggest reading

* <https://www.atlassian.com/git/tutorials/what-is-git>
* <https://bitbucket.org/product/guides/getting-started/overview#a-brief-overview-of-bitbucket>

so you can get more information about both.

I hope that helps.

Cheers,

Melo


Tags: bitbucket-cloud

cloud
how to make fisheye faster by using wrapper configue
Asked by joker world:

kindly help as soon as possible


Answers:
author: Felipe Kraemer
body: Hi [@joker world](/t5/user/viewprofilepage/user-id/1278725),

We believe we need a bit more context on what you need help with, but it looks like this document can help:

[Running FishEye as a Windows service](https://confluence.atlassian.com/fisheye/running-fisheye-as-a-windows-service-298976961.html)

If that's not exactly what you're looking for, can you please clarify?

Cheers,

Felipe
where can i see blocksize in fisheye?
Asked by joker world:

I want to check those 400 commits in my fisheye configuration


Answers:
author: Caterina Curti
body: Hi [@joker world](/t5/user/viewprofilepage/user-id/1278725),

Are you using an SVN (Subversion) repository?

If that's the case, you can find the Block Size option on the repository configuration page in Fisheye.

The [Subversion](https://confluence.atlassian.com/fisheye/subversion-298976887.html) page covers the details of the Block Size configuration option and how changing it may impact memory usage and indexing times.

Cheers,

Caterina - Atlassian
No LOC with Git repositories
Asked by Telis kaleas:

I was using Fisheye with Git repositories years ago (15) and now is not supported.

Anybody has any workaround for that?

Thank you in advance

Telis


Answers:
author: Caterina Curti
body: Hi [@Telis kaleas](/t5/user/viewprofilepage/user-id/1307233),

The **LoC for Git** repositories is available in Fisheye since version **4.3.0**.

Is this not what you are looking for? Which version of Fisheye are you using?

Cheers,

Caterina - Atlassian
can we integrate fisheye crucible with our bitbucket repos?
Asked by Rick:

we have Jira Bitbucket and Confluence integrated into the cloud. We now need Fisheye Crucible to integrate to bitbucket. How do we do it in the cloud?


Answers:
author: Felipe Kraemer
body: Hi [@Rick](/t5/user/viewprofilepage/user-id/1306878),

There is no integration specific to Bitbucket Cloud with Fisheye/Crucible, but you can connect Fisheye/Crucible to Bitbucket Cloud by adding a repository.

For adding a Bitbucket Cloud repository into Fisheye/Crucible, please follow our [Git documentation](https://confluence.atlassian.com/fisheye/git-298976891.html#Git-Gitrepositorieshostedelsewhere), under the section **Git repositories hosted elsewhere**.

Please let me know how this goes!

Regards,

Felipe


Tags: confluence-cloud

jira-administration

jira-cloud
Jira Gadget - Display Code Review Requests and Statuses
Asked by Sriram Gopalan:

Hi

I need to configure a dashboard gadget in Jira where a list of Code Review Requests and their statuses against every ticket in a Sprint needs to be displayed

Can someone please help me on how this can be achieved ?

Regards


Answers:
author: Caterina Curti
body: Hi [@Sriram Gopalan](/t5/user/viewprofilepage/user-id/1274824),

Are you integrating Fisheye with a Jira server installation (self-hosted by your company) or cloud (hosted by Atlassian)?

The Crucible Gadgets are not available anymore for Jira Cloud as of 24 July 2017, but they are still available for a self-hosted Jira installation.

You can find more details on the [Using Crucible gadgets](https://confluence.atlassian.com/crucible/using-crucible-gadgets-298977439.html) page.

Cheers,

Caterina - Atlassian

comments: author: Sriram Gopalan
body: Hi [@Caterina Curti](/t5/user/viewprofilepage/user-id/551009) - Many Thanks for your suggestion .

It appears that our Jira installation is self hosted by the company .

However , I only get to see the following 4 Crucible / Fish Eye Gadgets and not the ones referred by you in the link . Is this expected ?

If this is the case , then I am not sure if I can list out the review list against each issue in a sprint on a Jira dashboard

![Crucible-Fisheye-Gadgets.png](https://community.atlassian.com/t5/image/serverpage/image-id/20799iF082A331DFF631F5/image-size/large?v=v2&px=999 "Crucible-Fisheye-Gadgets.png")

Thanks


Tags: dashboard
why fish is slow how to resolve it and how to clean the memory autom atically
Asked by joker world:

our fisheye is very slow.. whenever we restart it becomes fast.how to solve this issue


Answers:
author: Ben Stuart
body: There may be many reasons, why an instance is slow. It's not very clear form your question, what is slow exactly, but I would like to suggest reading the following articles first:

* [Tuning FishEye performance](https://confluence.atlassian.com/fisheye/tuning-fisheye-performance-298976951.html)
* [Improve FishEye scan performance](https://confluence.atlassian.com/fisheye/improve-fisheye-scan-performance-298977087.html)
* [Best practices for FishEye configuration](https://confluence.atlassian.com/fisheye/best-practices-for-fisheye-configuration-298976952.html)
* [How FishEye uses memory](https://confluence.atlassian.com/fisheye/how-fisheye-uses-memory-630588323.html)

The number one reason that FishEye/ Crucible is running slow is because the application hasn't been tuned properly. A lot of tuning FishEye requires some trial and error and most of the time it requires a wholistic approach and not any one thing. That's why it's so important to read the above articles and make sure you understand the various tunable parameters (heap size, CPU, initial/ incremental indexer threads, [polling vs hooks](https://confluence.atlassian.com/fisheye/configuring-web-hooks-298976944.html), etc..) that will allow you to get the most out of your machine and the application.

It's also worth noting that if you're running FishEye/Crucible in a VM indexing of your repositories will certainly be much slower than if it were on a physical server. I/O throughput is very important to indexing performance.

Last but not least, there is always a chance that your environment is at fault as well (network, disk speed, disk space, file descriptors, I/O throughput, etc.). It's important to check if any of these could be the cause.

comments: author: joker world
body: Thank you so much for your response... our actual question is our fisheye is very slow often...when ever it is slow we restart the fisheye service then it will be quite fast.....then after few hours it will be slow again and we again restart it and it will be fast... we donot know why its slow but when we restart it will be fast enough ....we are experiencing for the past 2 months ....cloudnot find the problem ......

im giving some hint

1.The problem started coming when we started to add GIT repository before that we didnot experience this problem

please give a better solution to find why it is slow and why it is fast when we restart the service


author: Ben Stuart
body: Hey again! Unfortunately, I don't have any advice that I can provide for you without reviewing your logs and thread dumps. That would have to be done in a support case. If you have a support license, please raise a request at <https://support.atlassian.com/>.
Can I change workflow review?
Asked by ?????? ??????:

I want another code review workflow:

1. Author create review

2. Reviewer add comment for code

3. When reviewer finish he ask author fix defects

4. Author fix defects and notices reviewer for next round review

5. Reviewer can complete review or write new comments and ask author fix defects


Answers:
author: Rodrigo M
body: Hello ??????!

There are a few different review workflows already available within Crucible. You want to take a look at [Defining your workflow]( https://confluence.atlassian.com/display/CRUCIBLE/Defining+your+workflow) and see if one of them coincides with your needs.

You also want to review the [Flagging defects document](https://confluence.atlassian.com/crucible/flagging-defects-298977449.html).

Regards!

Rodrigo.

comments: author: ?????? ??????
body: Hello, Rodrigo.

Thank you for answer.

Am I right that reviewer can't say to author that first round review is complete?

How it works in our team:

1. Author send to reviewer code and open a task.

2. Reviewier see the code and left comments.

3. Then reviewer finish review, he change a status task for "need bugfix"

4. Author fix bugs and change task status "need review".

5. Reviewer see the changes and complete review. Task is done.

Which workflow you recommend for our team?
Fisheye get slowdown after configuring the git
Asked by mkukkapalli@affiniongroup.com:

Hi Team,

We have not faced any issue when we configured svn in fisheye. but recently we have configured git repository in fisheye. now fisheye get slowdown. everytime we are going to restart the service when the fisheye slows down. Can some one help on this?

Regards,

Madhava Rao.K


Answers:
author: Caterina Curti
body: Hi [mkukkapalli@affiniongroup.com](/t5/user/viewprofilepage/user-id/1153173),

It is unlikely that just by configuring Git, Fisheye became slower.

However, it could be that the additional Git repositories require more memory or resources in general.

How are the memory and cpu trends for the server? Did you already try to check for OutOfMemory errors and, if needed, increase the heap size?

Are the new repository still in their initial indexing phase (you can check that by looking for InitPing) in the logs or are all repositories in the incremental indexing phase (IncrPing in the logs)?

Let's also make sure that the indexing thread configuration is the default one (see [Configuring indexing](https://confluence.atlassian.com/fisheye/configuring-indexing-298976945.html)) and has not been increased.

Which version of Fisheye is installed?

Cheers,

Caterina - Atlassian
Don?t see the group in crucible reviewer drop down list
Asked by zamanmd:

Hi,

created new group in crucible but don't see that group in reviewer drop down list. Created another group before and I see that in reviewer list. Not sure what I am doing wrong.

Appreciate any suggestions. Using version 3.8.0


Answers:
author: Caterina Curti
body: Hi [@zamanmd](/t5/user/viewprofilepage/user-id/323614),

Can you check if the group has the appropriate permissions in the [permission scheme](https://confluence.atlassian.com/crucible/permission-scheme-298977334.html)?

Which settings do you have in place right now for the project permissions?

The [Choosing reviewers](https://confluence.atlassian.com/crucible044/choosing-reviewers-890948607.html)documentation also explains the following:
> You can choose reviewers from available Crucible users and groups by typing names into the **Reviewers** field. The users and groups that are available to be reviewers are determined by the project's settings for **Default Reviewers** -- see [Creating a project](https://confluence.atlassian.com/display/CRUCIBLE044/Creating+a+project).
>
> When adding a group to a review, only the first 50 users in the group are added -- extra users must be added individually. Note that a Crucible administrator can set the number of users added from a group by using the `crucible.users.per.group.in.review` property -- see [JVM system properties](https://confluence.atlassian.com/display/FISHEYE/JVM+system+properties).  
>
> You can also allow any Crucible user to add themselves as a reviewer by selecting **Allow anyone to join**.

Cheers,

Caterina - Atlassian
not able to upload patch
Asked by Shubham Tandon:

I am using Source tree for creating the Patch file.  
When tried to upload patch file on FishEye it shows following error :  

Error adding patch: revision display name may not be null or empty :  

Patch file dropbox link :  
[https://www.dropbox.com/s/8xwk7zoppdgu95k/Advance_PoE_TestCases_patch.diff?dl=0](https://www.dropbox.com/s/8xwk7zoppdgu95k/Advance_PoE_TestCases_patch.diff?dl=0 "Patch File Link")


Answers:
author: Caterina Curti
body: Hi [@Shubham Tandon](/t5/user/viewprofilepage/user-id/1242656),

Could you please share more details regarding the current setup and the patch here?

This is what I would like to collect to start investigating:

- the Fisheye version

- the full stack trace from the atlassian-fisheye-YYYY-MM-DD.log file when reproducing the issue

- if possible, the full content of the patch (the attachment is not accessible from Dropbox)

- the Git version used to create the patch

Which method (the various options are listed [here](https://confluence.atlassian.com/crucible/creating-patch-files-for-pre-commit-reviews-298977458.html)) have you been using to upload the patch? If you used the command line option, could you also try to generate the patch by running the git diff command (instead of using the command line option)? What happens if you paste the content directly into the patch user interface dialog in Fisheye (instead of uploading the file)?

We are also troubleshooting a similar issue on this [community question](https://community.atlassian.com/t5/Fisheye-Crucible-questions/Error-when-uploading-GIT-patch/qaq-p/825180#U827227), if you want to follow the conversation there as well.

Cheers,

Caterina - Atlassian
User login failure
Asked by Qu3st1:

I was just handed a Fisheye installation. The configuration has a connection to our AD group.

Then application can see all of the users and groups with in AD. From the Administration console the tests are showing green and synchronization is working.

But when a user try's to login using the server/login you cannot get logged in. It keeps displaying "Password incorrect or unknown user"

I have tried using domain\\user and just user.

The anonymous login feature does work. Just no user login.

Does anyone have any ideas?


Answers:
author: Rodrigo M
body: Hello!

The error that you are having could be that the System Administrator have not provide **global permission** to the users from the LDAP. Could you verify if the affected users or group/s have been assigned with the [Global permissions](https://confluence.atlassian.com/fisheye/global-permissions-812222809.html)?

Regards!

Rodrigo
crucible???git?????Committer username??
Asked by ???:

??crucible??git?????????Committer username???????crucible?user?git?username


Answers:
author: Caterina Curti
body: Hi [@???](/t5/user/viewprofilepage/user-id/1273957),

Would the "Author mapping" feature help?

See the [Author mapping](https://confluence.atlassian.com/fisheye/changing-your-user-profile-298976815.html#Changingyouruserprofile-author-mapping) documentation.

Cheers,

Caterina - Atlassian


Tags: china
How to change the name of a FishEye/Crucible instance?
Asked by David Rosenfeld:

I have a new installation of FishEye/Crucible 4.5.3 that I am linking to my existing Jira and Bitbucket servers. When I installed those tools, I was able to set the names of the instances to "MyCompany Bitbucket" and "MyCompany Jira". I could not find any place to do this in FishEye/Crucible. When go to create the application links from FE/C to Bitbucket, I see this (note: all of the tools are behind a reverse proxy):  

You are creating a link from:  

Display URL: <https://www.mycompany.com/bitbucket>  
Application URL: <https://www.mycompany.com/bitbucket>  
Name: MyCompany Bitbucket Server  
Application: Bitbucket Server  

To this application:  

Display URL: <https://www.mycompany.com/crucible>  
Application URL: <https://www.mycompany.com/crucible>  
**Name: dev**   
Application: FishEye / Crucible  

I want to update the highlighted name "dev" to "MyCompany Crucible"  

I would expect to find it under Global Settings / Server, but I don't see it there. I also don't see it under Front Page Customization, or anywhere else for that matter. Can someone tell me how to make this change?  

Thanks in advance for your help.


Answers:
author: Rodrigo M
body: Hi David

The name of the instance follows the name of the machine that is running FishEye/Crucible. Currently, we can't change that.

There is an open feature request for this which can be found here;

- [FE-4770](https://jira.atlassian.com/browse/FE-4770)

Please vote and comment on this feature request for a direct line of communication to our developers. With feature requests, the workflow is moved to the developer team and all further work/updates are moved to the feature request ticket.

Hope that answers your question!

Regards!

Rodrigo

comments: author: David Rosenfeld
body: Rodrigo,

Thank you for the information. I have voted for the ticket, and added a comment with the information that I posted in this thread.

David
Refreshing Test FeCru instance with the export from Production
Asked by Gregory Kremer:

I need to refresh FeCru Test instance in preparation for the app upgrade in Windows environment. I've created a backup.zip file of the Prod env and transferred it to my test server. As my test and prod configurations are different (for obvious reasons), I need to sabstitute config.xml file in the production backup.zip file from production with the one from test. So I have unzipped the backup.zip file, replaced the config.xml with its test version, zipped the file again. Logically fisheyectl.bat restore command should work. Right? I know it worked for me in UNIX/Linux environment. But Windows throw me an error "Restore failed - no config.xml was found in the file backup file". I know the file is there, but it's not visible to the system. Contacted Atlassian tech support, but they weren't helpful at all. Have anyone experienced similar problem? Is there a solution? I'd greatly appreciate an advice.


Answers:
author: Rodrigo M
body: Hi Gregory  

You can take a look at the resources below in order to have a test instance up:

* [Backing up and restoring FishEye data](https://confluence.atlassian.com/fisheye/backing-up-and-restoring-fisheye-data-298976928.html)
* [Migrating FishEye Between Servers](https://confluence.atlassian.com/fisheye/migrating-fisheye-between-servers-298977080.html)

My recommendation would be to create a new empty database on your test instance and restore the backup file on this new instance using the command line, as mentioned in the first document above. Use the database options in the restore procedure as needed, as you trying to restore the backup to a different database, to make sure you won't override your existing database.

<br />

Regards!

Rodrigo

comments: author: Gregory Kremer
body: Thank you for the advice. I've read the material you have suggested, but it makes the process more complicated/time consuming. I was hoping that there was a way to replace or edit config.xml in the backup.zip.