I've covered how to keep your fork in sync with the core in my blog post here: http://www.aaron-powell.com/umbraco-and-mercurial-how-to-contribute Yes it's command line, but this is why I advocate the command line, not using UI tools to obscure what is really going on under the hood ;)
I don't have TortoisHg installed (and have no intention of installing it) so I can't give you the UI steps that you need. However a lot of the stuff is covered in this video on Tekpub: http://tekpub.com/view/dotnet-oss/7 (it's a free video)
So how do you create the local repository? Is this done outside of Mercurial? I'm used to SVN where if a site already exists, I just click update, and it downlaods all the files and I can use them directly. When I cloned my fork, this just created a repository, but not necessarily the files that I can use.
So once i have the repository, I then need to just manually download the latest build and place that into the same folder that the .hg folder is in. THen I can commit to my local repository.
THen to keep my local repository in sync with the latest Umbraco changeset, I will need to have set up the default location and the core location. I update my local respository from the core. And then merge these changes with my local fork. Recompile. And then commit.
Is there anyone out there that is familiar with how to do this in TortoiseHG? I think I'm missing a step since I can't see how to merge my local fork with my local repository.Heck, I'm not even sure I technically have a local fork.
Did you refer to the GettingStarted.txt file in the root of the repository? That explains where all the code is. There are currently 6 branches, and the one you go into by default is default. As the GettingStarted.txt file explains there is no code in the default branch yet, it's going to contain v5 when it's committed across.
As for your statement regarding workflow that's spot on, you pull from the core, merge with your fork, compile/ test/ etc, commit to your local repository and then push your repository to your fork on codeplex.
Setting up Mercurial (for source review)
I checked out this article (http://shazwazza.com/post/A-UI-guide-to-using-Umbracoe28099s-new-repository-format-Mercurial.aspx), but I'm still confused.
There seems to be a section that I'm missing.
Basically, do I need to do it this way?
1. Download the latest codeset (no Meruciral connection)
2. Create the Fork in COdeplx.
3. In the same folder creating a clone from the Fork.
4. Click update.
So then any time I commit....it would commit to my local clone right?
And then from there...if I fixed a bug or something, I could commit it to my codeplex fork. I could then request a pull.
So if this is the case, and if someone creates a new changeset, how do i update it? Does my local fork get updated?
Thanks,
C
Yes you have the basic workflow down pat of:
- Create fork
- Clone fork
- Commit to local repository
- Push repository to codeplex
I've covered how to keep your fork in sync with the core in my blog post here: http://www.aaron-powell.com/umbraco-and-mercurial-how-to-contribute
Yes it's command line, but this is why I advocate the command line, not using UI tools to obscure what is really going on under the hood ;)
I don't have TortoisHg installed (and have no intention of installing it) so I can't give you the UI steps that you need. However a lot of the stuff is covered in this video on Tekpub: http://tekpub.com/view/dotnet-oss/7 (it's a free video)
So how do you create the local repository? Is this done outside of Mercurial? I'm used to SVN where if a site already exists, I just click update, and it downlaods all the files and I can use them directly. When I cloned my fork, this just created a repository, but not necessarily the files that I can use.
So once i have the repository, I then need to just manually download the latest build and place that into the same folder that the .hg folder is in. THen I can commit to my local repository.
THen to keep my local repository in sync with the latest Umbraco changeset, I will need to have set up the default location and the core location. I update my local respository from the core. And then merge these changes with my local fork. Recompile. And then commit.
Is there anyone out there that is familiar with how to do this in TortoiseHG? I think I'm missing a step since I can't see how to merge my local fork with my local repository.Heck, I'm not even sure I technically have a local fork.
-C
Did you refer to the GettingStarted.txt file in the root of the repository? That explains where all the code is.
There are currently 6 branches, and the one you go into by default is default. As the GettingStarted.txt file explains there is no code in the default branch yet, it's going to contain v5 when it's committed across.
As for your statement regarding workflow that's spot on, you pull from the core, merge with your fork, compile/ test/ etc, commit to your local repository and then push your repository to your fork on codeplex.
is working on a reply...