Is it possible to pull changed files if the code server hasn'tcommit/update it?

[Paul Franz]

Is version B and C modifying the same files? And often is this
occurring? How is the below example related to the problem with server A
and not being able to commit on the server A box?

Paul Franz

Alex.Wang wrote:
> Thank you very much for your advisition.
> I have tried your idea. However, there is another problem by using patch.
> Please conside the following conditions:
> I have an original version A, then it has two branches by two person.
> Assuming they have version B and C, obviously when B is changed, there
> is a patch delta(B) which can be only applied to B. C is the same.
> So if I get a delta(C), it always confilcts with version B. It is
> especially annoying to need manual interference when the conflicting
> sets are rather HUGE.
> Would you please give me some hits or techniques about how to deal
> with such conditions?
> Best regards.
> 2009-11-01
> ------------------------------------------------------------------------
> Alex.Wang
> ------------------------------------------------------------------------
> *发件人：* Paul Franz
> *发送时间：* 2009-11-01 08:16:21
> *收件人：* Martin Geisler
> *抄送：* mercurial
> *主题：* Re: Is it possible to pull changed files if the code server
> hasn'tcommit/update it?
> Since the changes have not been committed, you should be able to use "hg
> diff" to generate a patch that can be transfered to the client and
> applied there and then the changes in the server A workspace can be
> dropped via an "hg revert -a"
> Paul Franz
> Martin Geisler wrote:
> > "Alex.Wang" <geforce8800 at gmail.com> writes:
> >
> >
> >> Hi everyone.
> >> Assuming the following condition:
> >>
> >> I have a code server A, a compilatioin-test machine B. Then I modify
> >> some files in server A. Just at this point, I run "hg pull" to get the
> >> modified files in A, then fail. hg reports nothing updated.
> >> Then here comes my question: how can I "sync" the server and the
> >> client, assuming I am not allowed to run "hg commit/hg update"? is it
> >> possible to do so?
> >>
> >
> > You cannot. Mercurial only moves *history* (changesets) from one
> > repository to another, and until you have made a commit, the changes are
> > not part of the history.
> >
> > You'll have to use some other transport mechanism such as scp.
> >
> >
> > ------------------------------------------------------------------------
> >
> > _______________________________________________
> > Mercurial mailing list
> > Mercurial at selenic.com
> > http://selenic.com/mailman/listinfo/mercurial
> >
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial