Assume I received a gerrit review with following structure, and I only want to see (review) the files under Folder A. Does the GUI support that?
root dir
|
|--> Folder A
|
|--> Folder B
|
|--> Folder C
No, it doesn't have any specific feature related to that.
Related
I have a Bitbucket project and it is designed in such a way, I have to create new repository as slide-project with copying base-framework-code(bfc) since each slide is unique in its own way(kind of animated learning slides) so utilizing the bfc to create a separate repo.
It looks like below - Solutions is project and it contains repositories(named as slides):
-> Solutions |
| -> Base-Framework-Code(bfc)(master)
| -> slide-01 |(master)
|src
|bfc
|package.json
| -> slide-02 |(develop)
|src
|bfc
|package.json
| -> slide-03 |(feature)
|src
|bfc
|package.json
My requirement is to implement TeamCity auto build feature in Solutions project itself.
When developers create a new slide-xx(a new repository), auto build should be triggered to that slide repo(for starters consider master).
Can I achieve this with TeamCity?
Please help with sharing any kind of resource.
PS. I'm new to TeamCity and still learning, I have gone through docs and demos and I know its working with specific repository with specific branches.
Thanks in Advance!
I have over 10 years of software projects that I would like to commit to Hg.
This is for code related to Delphi 7, and includes 3rd party licensed libraries, open source libs managed with svn, and my own code (I'm planning a migration to Delphi XE5).
The 3rd party and svn-derived libs generally have components installed in the Delphi IDE, and should be kept at "latest" version (as a roll-back will generally bork the IDE), so I just back them up (they were svn externals that never got rolled-back).
My layout is as follows:
-Licensed
|-(third party libs)
...
-SVNRoot
|-(various open source from svn)
...
-CodeRoot
|
|-common (common to all projects)
|
|--major1
| |
| |-common (common to the major1 software)
| |
| |-Cust1 (projects for customer1)
| | |
| | |-C1Proj1
| | |
| | |-C1ProjN
| |
| |-Cust2
| |
| |-C2Proj1
| |
| |-C2ProjN
|
|--major2
| |
... ...
That is, a "common" folder with code that I generally include in all my projects, regardless of where they are deployed.
Then a breakdown by major product, with sub-projects customized by customer.
I've read a variety of tutorials, but I seem to be missing something...
I see how I can add everything under CodeRoot to a local repository by moving to ..\CodeRoot and running Hg Init.
It isn't clear to me that I'd be happy having everything under a single repository.
OTOH, if that topmost "common" folder isn't in everything, I have a problem.
The "common" under each major project has the same issue.
I'm not sure yet what my "granularity" should be - a repository per MajorProject, or per CustProject.
So - Questions:
1) If I go with "per MajorProject" - how to handle that topmost "common" folder?
2) If I go with "per CustProject" - how do I handle the topmost AND per-major project common folders (if they are handled differently than topmost)
3) finally if I want to create a remote central repository (instead of local), how do I safely move all my files to a remote central repository before cloning it local to my machine?
TIA.
Cheers,
EdB
I would definitely not stick everything in one repository, although you might use sub-repostories within a top level. I havent used those myself however.
I would suggest split it up in the smallest chunks that make sense. You can always pull from multiple repos into a new repo if you later decide you actually want a larger grouping.
With regards to getting the files into a central, server held repo. Just push to it, or on the server clone from your local repo.
For 1) and 2), they both can be answered with sub-repositories. The main repository is also a repository, so your common folder will be handled by the main repository, and all your major projects will be in their own sub-repos.
Now, choosing whether or not you wish to use sub-repos for customer is up to you, though.
As for 3), once you have your local repo, make a clone on the central repository you wish to use. For Mercurial, once a repo has been cloned, it does not know in itself that it is a clone. They are linked through a reciprocal path, but clones are in no way different than the original!
We have a very simple branching pattern consisting of two branches.
The branch Trunk is used as the main production branch with bug-fixes and quick UI improvements, whereas TrunkSplit was used to split one big solution files into 6 smaller solutions.
However we faced problems during the Forward Integration (FI): even though for all changes TFS correctly showed the target file (despite renaming and moving to another folder), the merged files were created following the older folder structure.
For example here you see that instead of merging the changes into FieldManagement.UI (down) the TFS created a new folder and placed the merged files there (up).
How can we fix this?
I just tested this scenario on TFS2010. This is what I did:
I created a branch (A) with 2 folders:
-> Analysis (Folder)
-> ABC (folder)
-> hello.html (file)
-> Auth (folder)
-> XYZ (Folder)
Now I created another branch from A called A-Branch. I moved the folder ABC from Analysis to the Auth folder as shown below:
-> Analysis (Folder)
-> Auth (folder)
-> ABC (folder)
-> hello.html (file)
-> XYZ (Folder)
Now I edited the file hello.html and added some new text in there. Merged the code from A to A-branch. As you mentioned, it rightly identified the target file and showed a conflict. I auto-resolved the conflict and it edited the file at the right location (Auth -> ABC -> hello.html) without any issues.
Are you doing anything different? or am i missing something?
At some stage I created a project under my solution. Checked it in. Then later removed it from the solution and deleted the files manually.
When i go to the check in window, the project is still there:
Service.csproj | edit | (Folder Location)
Service.csprojvspscc | edit | (Folder Location)
I cant check them in because they do not exist anymore.
Check In: Operation not performed
Cound not find file (folder location)
Please refer to the Output window for more information
The output window basically echos what is said above.
How do i remove these file from listing here? I dont need them in source control or on the local machine anymore.
Right click on the solution and choose "Undo Pending Changes" - in the window that pops up, select only those files that belonged to the project you deleted.
When I do a 'Publish' on my ASP.NET MVC website, I'm finding unnecessary empty folders in the publish folder.
This is annoying because I have to manually delete them so they don't get uploaded through FTP.
This happens even when I select the following radio-buttons:
Delete all existing files prior to publish
Copy
Only files needed to run this application
It doesn't copy every folder, only one or two random folders. I have no idea why it chooses to copy just these folders, but not the others. They're not system-folders or anything - I made them myself.
Why is this happening?
It's just the way the publish wizard works. If you want more control over how a web project is deployed you can make a web deployment project if you have developer edition of Visual Studio. (Perhaps professional as well I'm not sure.)
Looks like you might be able to download it too?
http://www.microsoft.com/downloads/details.aspx?FamilyId=0AA30AE8-C73B-4BDD-BB1B-FE697256C459&displaylang=en
The Publish Wizard seems to include empty root-level custom folders if they contain subfolders that also contain code. Example:
--Folder1 -+
+- ParentClass.cs
+- Subfolder2 -+
+- ChildClass1.cs
+- ChildClass2.cs
Will result in an empty "Folder1" showing up in the location you publish to. I think this is an artifact of the "Namespace Provider" property on folders and the <Compile Include="Folder1\Subfolder2\ChildClass1.cs" /> elements of the csproj file.