[mvccontrib-discuss] How can I make sure my fork is up to date with the latest main trunk code?

1 view
Skip to first unread message

Justin A

unread,
May 23, 2010, 10:00:02 AM5/23/10
to mvccontrib-discuss
Hi folks,

yep - this is a really newbie question, so please be nice :) I'm a TFS
person .. so i'm trying to pick up this Mercurial stuff.

So, I've made my fork and I've checked-in a least one code change (i
didn't noticed i forgot to check in some more stuff).

But .. anyways, is there any way I could make sure all the code for
_all_ the other projects are up to date, on my local machine .. before
I do a check in? (and if there's any diff, then i take I would merge).

I've installed v1.0.3 of TortHG .. which is what I'm using to push/
pull (I have to learn all these new terms *blush*)

So yeah ... can anyone please help?

Also, does my solution which i'm using suppose to have all the samples
in it? or is that Samples folder, seperate from the solution?

cheers :)

(PS. I hope i used the correct terms, in the subject, right ... )

--
Contact Jeffrey Palermo or Eric Hexter with specific questions about the MvcContrib project. Or go to http://mvccontrib.org

To unsubscribe from this group, send email to mvccontrib-disc...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/mvccontrib-discuss?hl=en

Jeremy Skinner

unread,
May 23, 2010, 10:46:11 AM5/23/10
to mvccontri...@googlegroups.com
Hi Justin,

To keep your fork up to date you can instruct mercurial to pull changes from the main repository in to your local repository. Using the command line you would use:

Using tortoisehg you should be able to use the Synchronize dialog, and change the URL that it will pull from.

Once you've pulled from the main repo into your local repo, you can then push back to your fork with an hg pull.

You may want to check out hginit.com which illustrates this process graphically: http://hginit.com/02.html

Hope this helps,

Jeremy 

Jeremy Skinner

unread,
May 23, 2010, 10:52:42 AM5/23/10
to mvccontri...@googlegroups.com
...sorry, that 2nd to last sentence should have said: 

"Once you've pulled from the main repo into your local repo, you can then push back to your fork with an hg push".

Eric Williams

unread,
May 23, 2010, 11:23:04 AM5/23/10
to mvccontri...@googlegroups.com
You might also check out the free TekPub video on Mercurial for Codeplex http://tekpub.com/codeplex

-Eric
Reply all
Reply to author
Forward
0 new messages