March 14, 2010
Stephen Colebourne: Java language design by use case.
In a blog in 2006 Neal Gafter
wrote
about how language design was fundamentally different to API design and how use cases
were a bad approach to language design.
This blog questions some of those conclusions in the context of the Java language.
More »
March 13, 2010
FindBugz Community Review. I am very fond of FindBugz (indeed it has found its way into the QA process of most projects I work on....). When visiting the site to check Eclispe 3.5.2 compatibility I found they were working on a new tool.
Indeed a very interesting tool.
Looks li...
More »
March/2010
| Sun | Mon | Tue | Wed | Thu | Fri | Sat |
| | 1 |
2 |
3 |
4 | 5 | 6 | | 7 | 8 | 9 |
10 | 11 |
12 |
13 | | 14 |
15 |
16 | 17 | 18 | 19 | 20 | | 21 | 22 | 23 | 24 | 25 | 26 | 27 | | 28 | 29 | 30 | 31 | | | |
|
 |
home > news >
developers >
mercurial tip: checking in regularly with uncommitted changes in your clone
Mercurial Tip: Checking in regularly with uncommitted changes in your clone
NetBeans, like OpenJDK and OpenSolaris, uses the Mercurial distributed version control system. I'm a big fan of of distributed version control. However, one thing that drives me nuts is this error message:
% hg merge
abort: outstanding uncommitted changes
This isn't just going to be a rant - I've finally found a solution which is working extremely well for me. I've suggested it to some other developers who have also reported that it works well for them, so I thought I would share it with you.
The reason I run into this all the time is my preferred style of work:
I like to work on many things simultaneously. If while working on something, I come across a bug and I spot the problem, I just fix it right there and add a test for it. When I get ideas, I might go and put @todo tasks for myself, or leave editorial comments in various source files. I might also work on a couple of larger tasks simultaneously. Yes, I know the preferred Mercurial idiom for this is to have multiple clones, one for each task - but that isn't my preferred way of doing it. Each NetBeans clone is huge and takes a while to both clone and build - and I would have to switch my IDE editing context between these large source trees all the time.
I like to check things in in logical chunks with a message that pertains to that particular change. This means I often check in a subset of the edited files in the tree.
I like to check in code regularly ra...
Date: October, 31 2008
Url: http://blogs.sun.com/tor/entry/mercurial_tip_checking_in_regularly
Others News
Leave a Reply
Related
- So I'm checking my mail... - Page 27 - Stargate Worlds Game Forums Page 27-So I'm checking my mail... Beta Discussions ... I can see logging into the forums regularly or frequent ... mercurial: View Public Profile: Send a private message to ...
- Mercurial ... use of version control systems, and in particular Mercurial. ... regularly: what is the most recent version. sometimes: how did ... Checking the status of files. Suppose our first file is hello ...
- teleported bits: Getting my feet wet Tor's quick Mercurial tip IS a life saver: http://blogs.sun.com/tor/entry/mercurial_tip_checking_in_regularly I am all set to get drenched.
- Re: Re: ON Mercurial repository mirror: msg#00071 It is not just people who pull regularly, though they are ... and trying to migrate to hg and not as at generic mercurial ... hooks checking comment format, RTI, etc, etc, and refusing ...
- OpenSolaris Forums : ON Mercurial repository mirror ... First up: Please keep in mind this is part of the Mercurial ... It is not just people who pull regularly, though they are ... hooks checking comment format, RTI, etc, etc, and refusing ...
- Eric Arseneau's Weblog Mercurial Tip: Checking in regularly with uncommitted changes in your clone Wednesday November 05, 2008
- Mercurial Tip: Checking in regularly with uncommitted changes in your ... NetBeans, like OpenJDK and OpenSolaris, uses the Mercurial distributed version control system. I'm a big fan of of distributed version control. However, one thing that drives me ...
- Well, I'm Back: Mercurial I've started using Mercurial, and it's been mostly good. ... is not a good place to pull from (it's not updated regularly ... could move over right now, except for actually checking in ...
- Distributed Revision Control Systems: Git vs. Mercurial vs. SVN ... So much so that I would regularly "wait" a little while ... that I've never been happier developing code and checking ... so enlightened, I decided to check out git and Mercurial ...
- Mercurial Tip: Checking In Regularly With Uncommitted Changes In Your ... October 2008: Mercurial Tip: Checking in regularly with uncommitted changes in your clone, QA with Josh Bloch, Webinar: Building C/C++/Fortran Applications on OpenSolaris and Linux ...
- Tor Norbye's Weblog Friday October 31, 2008 Mercurial Tip: Checking in regularly with uncommitted changes in your clone. NetBeans, like OpenJDK and OpenSolaris, uses the Mercurial distributed version ...
- Mercurial as a backup tool (on MoinMoin example) - Mekk's programming ... Mercurial (or other DVCS) can be used to implement very ... data to it, commited, and configured cron job to regularly ... Some status checking commands for curious: master$ hg status ...
- Nabble - Mercurial - Avoiding conflicts in .hgtags Mercurial mailing list Mercurial@... http://selenic.com ... What is your reason for not just checking if lines are ... But if you regularly have to merge tags files, you probably ...
- Mercurial 28/07/2008 13:44 Mercurial Page 1 of 17 file:///Users/fangohr ... have backup copies in other places need to know: regularly ... only once for a given repository: $project1> hg init Checking ...
- A Mercurial Absence on MySpace Music - Free Streaming MP3s, Pictures ... Download A Mercurial Absence Rock / Metal / Progressive music singles, watch music ... THE SITES ONLY AS GOOD AS THE MEMBERS THAT POST ON IT SO MAKE SURE YOU KEEP CHECKING REGULARLY ...
|