[OpenWalnut-Dev] abort: outstanding uncommitted changes

[Mathias Goldau]

Dear nuts,

as we all know uncommited changes in the wrong branch are a pain to resolve.
Those three lines will help you and they work:

hg diff --git > ~/saved-work.patch
hg update --clean desiredbranch
hg import --no-commit ~/saved-work.patch

of course you may write some small custom scripts if you need.

HTH,
math

On 04.07.2012 21:58, Mathias Goldau wrote:
> On 04.07.2012 20:14, Alexander Wiebel wrote:
>> Dear Walnuts,
>> I just found a nice and most imprtantly _easy_ solution for the above
>> message when merging. Please follow this link:
>>
>> http://mercurial.selenic.com/wiki/FAQ#FAQ.2BAC8-CommonProblems.Why_won.27t_Mercurial_let_me_merge_when_I_have_uncommitted_changes.3F
>>
> 
> thanks for sharing the info. However I would like to know which of the
> possible solutions (diff+patch,shelves,queues,working dir) you consider easy?
> I always use the diff and patch solution, but its hard to remeber and fiddle
> around with the -p option from the patch command in order to get paths
> corrected. Hg queues are a mess (not very intuitve to use) and considered very
> dangerous (at least I believe christan said that it modifies the underlying
> .hg/* files directly). Hg shelve seems almost the solution to the problem, but
> last time I tried it was either too much interaction (as same as creating new
> working dir) or didn't worked quite well. So I decided to stay with diff and
> patch. But maybe I overlooked and missed some important points?
> 
> cheers,
> Mathias
> _______________________________________________
> OpenWalnut-Dev mailing list
> OpenWalnut-Dev at lists.informatik.uni-leipzig.de
> http://lists.informatik.uni-leipzig.de/mailman/listinfo/openwalnut-dev
> 
> Archive: http://lists.informatik.uni-leipzig.de/pipermail/openwalnut-dev/
> 


-- 
Universität Leipzig
Fakultät für Mathematik und Informatik
Institut für Informatik
Augustusplatz 10, 04109 Leipzig
Phone: +493419732283