Merging - are we doing something wrong?

[Luis Navarro]

OK, the need to merge in this scenario makes sense.  Thanks for the
explanation.

But is it expected that the user is forced to have a clean environment (no
uncommitted files) to do a merge?

Yes, Bob and Alice are the prototypical users but Alice is on jury duty this
week so Mary's filling in.  :)


On Tue, Sep 28, 2010 at 10:29 PM, Dave Brosius <dbrosius at mebigfatguy.com>wrote:

>  On 09/29/2010 01:20 AM, Luis Navarro 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?
> 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!
>
>
> _______________________________________________
> Mercurial mailing listMercurial at selenic.comhttp://selenic.com/mailman/listinfo/mercurial
>
>
> Mercurial doesn't track commits of files, it tracks commits of change sets,
> so the fact that mary hasn't touched files that bob have touched doesn't
> matter. Mary must merge because she doesn't have the change sets that the
> staging repo has.
>
> The rebase extension makes this much easier to deal with.
>
> BTW, i thought  Bob and Alice were the prototypical users:
> http://en.wikipedia.org/wiki/Alice_and_Bob
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20100928/6e9705a4/attachment.htm>