Why can't I merge when there are uncommitted outstanding changes?

Aardwolf toiletpot at gmail.com
Thu Apr 22 10:06:10 CDT 2010


I've read about this here:
http://blogs.sun.com/tor/entry/mercurial_tip_checking_in_regularly

It's probably almost the only solution... But admit it, it's not simple
either. It requires manually pushing twice or making an sh script to do the
pushing twice for you, meaning no IntelliJ plugin will be able to do it
currently, making it less convenient in some cases.

Still, why do I encounter all these problems? Isn't it normal for a
developer to have various files he doesn't want to (currently) commit? I
know it is for me and most people here. There are so many reasons: partially
wanting to commit some of your work while keeping the rest local due to
still needing to work it out further. Local config file changes. Local test
code, .... Why is hg made so inconvenient for this case?

Also, what's the point of actually creating branches and merges in the hg
repository, just because someone else changed *different* files? The history
could be perfectly linear there...


Stephen Rasku-3 wrote:
> 
> On Thu, Apr 22, 2010 at 07:49, Aardwolf <toiletpot at gmail.com> wrote:
> 
>>
>> I'm sorry, but I tried this shelve extension, and it simply doesn't work
>> for
>> me.
>>
> 
> Can you do the following?:
> 
> 1. clone the repo that needs the merge
> 2. do merge in clone
> 3. push merged clone (either to your repository or directly upstream)
> 
> Would that work for you?
> 
> ...Stephen
> 
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
> 
> 

-- 
View this message in context: http://old.nabble.com/Why-can%27t-I-merge-when-there-are-uncommitted-outstanding-changes--tp28329783p28330165.html
Sent from the Mercurial mailing list archive at Nabble.com.



More information about the Mercurial mailing list