Large numbers of small, independent changes, one big patch pushed.

Daniel Pittman daniel at rimspace.net
Wed Nov 14 06:03:27 UTC 2007


Dustin Sallings <dustin at spy.net> writes:
> On Nov 13, 2007, at 20:19, Daniel Pittman wrote:
>
>> The first is that they like to edit changesets until they are perfect,
>> then push the single "correct" change into the public repository.
>>
>> This is the darcs "ammend" function, and we believe that the generally
>> accepted answer to this is to use the Mercurial Queues system?
>
> 	It is.  If you committed something and want to edit it (obviously
> before you push), you'll do this:
>
> 	hg qimport -r tip
> 	[edit stuff]
> 	hg qrefresh
> 	hg qdel -r qtip
>
> I don't worry so much about such things, though.  I accept that if I
> didn't make mistakes, I wouldn't even need revision control, because
> there'd only be one revision.  :)

Me too, but one of our staff likes it -- and who am I to stomp on their
creativity, eh? ;)

[...]

> I'd argue for relaxing a bit again, but mq will do this for you as
> well.  For example, I created a new repo and added a file with one
> line.  Then in three subsequent changesets, I added three more lines.

[...]

> Otherwise, just do it all with mq anyway (skip the initial commits and
> import).  That's pretty much how I work.

Thank you *so* much for this.  I believe this will address the users
specific use cases nicely.  

Do you mind if I reproduce your message in our internal wiki for
convenience sake?

Regards,
        Daniel
-- 
Daniel Pittman <daniel at cybersource.com.au>           Phone: 03 9621 2377
Level 4, 10 Queen St, Melbourne             Web: http://www.cyber.com.au
Cybersource: Australia's Leading Linux and Open Source Solutions Company



More information about the Mercurial mailing list