On Tue, 28 Sep 2010 21:42:08 -0700 Luis Navarro <[email protected]> wrote: > Background: Bob and Mary have their own repos. They both push up to a > staging repo. The staging repo is set up to automatically do an > update after each push into it. > > Scenario: > 1) Bob edits and commits file #1 in his repo. > 2) Mary edits and commits file #2 in her repo. > 3) Bob pushes his changeset to the staging repo. > 4) Mary pulls Bob's changeset down into her repo. > > Questions: > 1) Even though Bob and Mary worked on different files, Mary has to do > a merge before she can push her changes into the staging repo. Why > is this?
Read Mercurial wiki at [1]. > 2) Furthermore, if Mary has any uncommitted changes in her repo, she's > prevented from doing the merge and is stuck in the water until she > commits or gets rid of her uncommitted changes. Are we doing > something wrong here? Mercurial FAQ [2]. And maybe it's worth to read [3]. Have fun, Renat [1] http://mercurial.selenic.com/wiki/UnderstandingMercurial#Cloning.2C_Making_Changes.2C_Merging.2C_Pulling_and_Updating [2] http://mercurial.selenic.com/wiki/FAQ#FAQ.2BAC8-CommonProblems.Why_won.27t_Mercurial_let_me_merge_because_I_have_uncommitted_changes.3F [3] http://blogs.sun.com/tor/entry/mercurial_tip_checking_in_regularly -- Probleme kann man niemals mit derselben Denkweise loesen, durch die sie entstanden sind. (Einstein)
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
