mercurial/crew at 4366: 11 outgoing changesets
Mercurial Commits
hg at intevation.org
Fri Apr 20 11:00:08 UTC 2007
11 outgoing changesets in mercurial/crew:
http://hg.intevation.org/mercurial/crew/rev/bf8319ee3428
changeset: 4366:bf8319ee3428
tag: tip
parent: 4364:97962a3e73cf
parent: 4365:aed9e6dceb85
user: Thomas Arendsen Hein <thomas at intevation.de>
date: Thu Apr 19 17:54:43 2007 +0200
summary: Merge with crew-stable
http://hg.intevation.org/mercurial/crew/rev/aed9e6dceb85
changeset: 4365:aed9e6dceb85
parent: 4355:c3c53eb44611
user: Thomas Arendsen Hein <thomas at intevation.de>
date: Thu Apr 19 17:52:42 2007 +0200
summary: Avoid float rounding errors when checking http protocol version.
http://hg.intevation.org/mercurial/crew/rev/97962a3e73cf
changeset: 4364:97962a3e73cf
user: Thomas Arendsen Hein <thomas at intevation.de>
date: Thu Apr 19 13:04:26 2007 +0200
summary: Work around problem where 'del os.environ["FOO"]' doesn't update environment.
http://hg.intevation.org/mercurial/crew/rev/c6413f8f2f8e
changeset: 4363:c6413f8f2f8e
user: Thomas Arendsen Hein <thomas at intevation.de>
date: Thu Apr 19 12:47:55 2007 +0200
summary: Use python instead of shell printf with \x for test-simplemerge-cmd
http://hg.intevation.org/mercurial/crew/rev/390d110a57b8
changeset: 4362:390d110a57b8
parent: 4361:46280c004f22
parent: 4353:1ccd3b9a7b1f
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Mon Apr 16 20:23:45 2007 -0300
summary: Merge with crew.
http://hg.intevation.org/mercurial/crew/rev/46280c004f22
changeset: 4361:46280c004f22
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Mon Apr 16 20:17:39 2007 -0300
summary: change tests to use simplemerge by default
http://hg.intevation.org/mercurial/crew/rev/d5c3a70f8422
changeset: 4360:d5c3a70f8422
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Mon Apr 16 20:17:39 2007 -0300
summary: polish the simplemerge command; add a test
http://hg.intevation.org/mercurial/crew/rev/2e3c54fb79a3
changeset: 4359:2e3c54fb79a3
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Mon Apr 16 20:17:39 2007 -0300
summary: actually port simplemerge to hg
http://hg.intevation.org/mercurial/crew/rev/465b9ea02868
changeset: 4358:465b9ea02868
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Mon Apr 16 20:17:39 2007 -0300
summary: Import 3-way merge code from bzr
http://hg.intevation.org/mercurial/crew/rev/99c853a1408c
changeset: 4357:99c853a1408c
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Mon Apr 16 20:17:39 2007 -0300
summary: add mdiff.get_matching_blocks
http://hg.intevation.org/mercurial/crew/rev/1ccd3b9a7b1f
changeset: 4353:1ccd3b9a7b1f
parent: 4349:69109aa0cddd
parent: 4352:5e857d72d3ac
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Mon Apr 16 13:31:15 2007 -0300
summary: Merge with crew-stable.
--
Repository URL: http://hg.intevation.org/mercurial/crew
More information about the Mercurial-devel
mailing list