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?
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?
It seems like Mary should be able to selectively commit the files that are
ready for pushing to staging while having others (perhaps in a different
module) that are still works in progress.
Thanks in advance!
------------------------------------------------------------------------------
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
