mercurial at 5060: 17 new changesets

Mercurial Commits hg at intevation.org
Thu Aug 2 14:15:09 CDT 2007


17 new changesets in mercurial:

http://www.selenic.com/hg/rev/58006f8b8275
changeset:   5044:58006f8b8275
parent:      5041:49059086c634
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 01 11:37:11 2007 -0700
summary:     imerge extension and test

http://www.selenic.com/hg/rev/8b1ee1f59b3c
changeset:   5045:8b1ee1f59b3c
parent:      5041:49059086c634
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Wed Aug 01 12:03:10 2007 -0700
summary:     dirstate: improve error message on file/directory clash

http://www.selenic.com/hg/rev/ed68c8c31c9a
changeset:   5046:ed68c8c31c9a
parent:      5045:8b1ee1f59b3c
parent:      5044:58006f8b8275
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Wed Aug 01 12:03:50 2007 -0700
summary:     Automated merge with http://hg.intevation.org/mercurial/crew

http://www.selenic.com/hg/rev/d9689c6474bd
changeset:   5047:d9689c6474bd
parent:      5046:ed68c8c31c9a
parent:      5043:bf444a9a9c23
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 01 14:26:30 2007 -0700
summary:     Merge with mpm

http://www.selenic.com/hg/rev/8db8e1100f3f
changeset:   5048:8db8e1100f3f
parent:      5029:ac97e065cfc7
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 01 14:32:05 2007 -0700
summary:     Update asciidoc instructions to suggest html4 for newer versions

http://www.selenic.com/hg/rev/41284ad94852
changeset:   5049:41284ad94852
parent:      5047:d9689c6474bd
parent:      5048:8db8e1100f3f
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 01 14:32:53 2007 -0700
summary:     Merge with stable

http://www.selenic.com/hg/rev/2bd996d0aaf8
changeset:   5050:2bd996d0aaf8
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 01 15:16:42 2007 -0700
summary:     convert: (svn) simplify _find_children

http://www.selenic.com/hg/rev/e3dffbdc6522
changeset:   5051:e3dffbdc6522
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Thu Aug 02 01:56:08 2007 -0300
summary:     update tests output

http://www.selenic.com/hg/rev/a11e8a181bd5
changeset:   5052:a11e8a181bd5
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Thu Aug 02 01:56:08 2007 -0300
summary:     convert: fix locking order

http://www.selenic.com/hg/rev/47a8ea1eb2c3
changeset:   5053:47a8ea1eb2c3
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Thu Aug 02 01:56:08 2007 -0300
summary:     del transaction before lock before wlock

http://www.selenic.com/hg/rev/ec70fd08e16c
changeset:   5054:ec70fd08e16c
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 01 23:59:19 2007 -0700
summary:     Update imerge for new filemerge interface

http://www.selenic.com/hg/rev/56d48aed1f69
changeset:   5055:56d48aed1f69
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Thu Aug 02 14:04:00 2007 +0200
summary:     imerge: tarfile.extractall is only available in python2.5

http://www.selenic.com/hg/rev/34a54cc5df1b
changeset:   5056:34a54cc5df1b
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Thu Aug 02 14:04:51 2007 +0200
summary:     imerge: sorted() is only available in python2.4 and above

http://www.selenic.com/hg/rev/99a4592ea886
changeset:   5057:99a4592ea886
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Thu Aug 02 14:51:49 2007 +0200
summary:     The >| redirection does not exist in plain sh.

http://www.selenic.com/hg/rev/a3d6de2838de
changeset:   5058:a3d6de2838de
parent:      5048:8db8e1100f3f
parent:      5042:f191bc3916f7
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Thu Aug 02 13:03:25 2007 +0200
summary:     merge with hg-stable

http://www.selenic.com/hg/rev/8d9bdcbb2b18
changeset:   5059:8d9bdcbb2b18
user:        Matt Mackall <mpm at selenic.com>
date:        Thu Aug 02 12:29:10 2007 -0500
summary:     merge: avoid double deletion mentioned in issue636

http://www.selenic.com/hg/rev/2ef14e29e538
changeset:   5060:2ef14e29e538
tag:         tip
parent:      5057:99a4592ea886
parent:      5059:8d9bdcbb2b18
user:        Matt Mackall <mpm at selenic.com>
date:        Thu Aug 02 13:23:53 2007 -0500
summary:     Merge with -stable

-- 
Repository URL: http://www.selenic.com/hg


More information about the Mercurial-devel mailing list