mercurial/crew at 5300: 91 outgoing changesets

Mercurial Commits hg at intevation.org
Wed Sep 12 06:00:18 CDT 2007


91 outgoing changesets in mercurial/crew:

http://hg.intevation.org/mercurial/crew/rev/81575b7b505e
changeset:   5300:81575b7b505e
tag:         tip
parent:      5297:ec061aaa25a4
parent:      5299:5a4824f6665c
user:        Patrick Mezard <pmezard at gmail.com>
date:        Tue Sep 11 23:38:29 2007 +0200
summary:     Merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/5a4824f6665c
changeset:   5299:5a4824f6665c
user:        Patrick Mezard <pmezard at gmail.com>
date:        Tue Sep 11 23:05:30 2007 +0200
summary:     Test parents behaviour with files.

http://hg.intevation.org/mercurial/crew/rev/cba2a689117d
changeset:   5298:cba2a689117d
parent:      5296:c8efd19e248c
user:        Patrick Mezard <pmezard at gmail.com>
date:        Tue Sep 11 23:04:42 2007 +0200
summary:     parents: make it match the doc when called on a file

http://hg.intevation.org/mercurial/crew/rev/ec061aaa25a4
changeset:   5297:ec061aaa25a4
parent:      5295:51b132b4fd36
parent:      5296:c8efd19e248c
user:        Brendan Cully <brendan at kublai.com>
date:        Tue Sep 11 13:24:52 2007 -0700
summary:     Merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/c8efd19e248c
changeset:   5296:c8efd19e248c
parent:      5292:5a65d870871d
user:        Brendan Cully <brendan at kublai.com>
date:        Tue Sep 11 13:23:59 2007 -0700
summary:     Document pseudo-tags "null" and ".".

http://hg.intevation.org/mercurial/crew/rev/51b132b4fd36
changeset:   5295:51b132b4fd36
parent:      5294:e14118f92730
parent:      5293:32ec518ee3cb
user:        Brendan Cully <brendan at kublai.com>
date:        Mon Sep 10 15:00:19 2007 -0700
summary:     Merge with crew

http://hg.intevation.org/mercurial/crew/rev/e14118f92730
changeset:   5294:e14118f92730
parent:      5290:05889b6b1468
user:        Brendan Cully <brendan at kublai.com>
date:        Mon Sep 10 15:00:05 2007 -0700
summary:     mq: fix regression in 6fd953d5faea

http://hg.intevation.org/mercurial/crew/rev/32ec518ee3cb
changeset:   5293:32ec518ee3cb
parent:      5290:05889b6b1468
parent:      5292:5a65d870871d
user:        Patrick Mezard <pmezard at gmail.com>
date:        Mon Sep 10 23:53:23 2007 +0200
summary:     Merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/5a65d870871d
changeset:   5292:5a65d870871d
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Sep 10 23:34:33 2007 +0200
summary:     sshrepo: fix Windows command quoting

http://hg.intevation.org/mercurial/crew/rev/23651848d638
changeset:   5291:23651848d638
parent:      5289:ed6df6b1c29a
user:        Patrick Mezard <pmezard at gmail.com>
date:        Mon Sep 10 23:36:01 2007 +0200
summary:     extdiff: avoid repr() doubling paths backslashes under Windows

http://hg.intevation.org/mercurial/crew/rev/05889b6b1468
changeset:   5290:05889b6b1468
parent:      5288:18091102a633
parent:      5289:ed6df6b1c29a
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Fri Sep 07 17:54:38 2007 +0200
summary:     merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/ed6df6b1c29a
changeset:   5289:ed6df6b1c29a
parent:      5276:aea35488ea66
user:        Dirkjan Ochtman <dirkjan at ochtman.nl>
date:        Fri Sep 07 17:38:52 2007 +0200
summary:     Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.

http://hg.intevation.org/mercurial/crew/rev/18091102a633
changeset:   5288:18091102a633
user:        Edward Lee <edward.lee at engineering.uiuc.edu>
date:        Fri Sep 07 16:35:43 2007 +0200
summary:     interhg: allow more flexible pattern specification (fixes 2/3 of issue699)

http://hg.intevation.org/mercurial/crew/rev/c6f932d3e0f6
changeset:   5287:c6f932d3e0f6
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Fri Sep 07 16:14:51 2007 +0200
summary:     Don't decode unicode strings.

http://hg.intevation.org/mercurial/crew/rev/cbec83d9b0b4
changeset:   5286:cbec83d9b0b4
user:        Brendan Cully <brendan at kublai.com>
date:        Thu Sep 06 18:12:36 2007 -0700
summary:     Update test-record for 3ef190234b55

http://hg.intevation.org/mercurial/crew/rev/3ef190234b55
changeset:   5285:3ef190234b55
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Thu Sep 06 10:52:54 2007 -0700
summary:     record: change wording of initial per-file prompt

http://hg.intevation.org/mercurial/crew/rev/f8c36b215281
changeset:   5284:f8c36b215281
user:        Steve Borho <steve at borho.org>
date:        Wed Sep 05 21:53:59 2007 +0200
summary:     hgk: add repo root to window title

http://hg.intevation.org/mercurial/crew/rev/4fe04b183fd8
changeset:   5283:4fe04b183fd8
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Tue Sep 04 18:37:28 2007 +0200
summary:     Forgot to quote "6^" in test-parentrevspec (see 94e77a174f55)

http://hg.intevation.org/mercurial/crew/rev/22ddde515fda
changeset:   5282:22ddde515fda
user:        Patrick Mezard <pmezard at gmail.com>
date:        Tue Sep 04 13:56:15 2007 +0200
summary:     test-convert-hg-source: enforce conversion order with --date

http://hg.intevation.org/mercurial/crew/rev/a176f9c8b26e
changeset:   5281:a176f9c8b26e
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Sat Sep 01 02:49:18 2007 -0300
summary:     convert: rename a class and a function

http://hg.intevation.org/mercurial/crew/rev/11e1e574da02
changeset:   5280:11e1e574da02
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Sat Sep 01 02:49:18 2007 -0300
summary:     convert: mercurial_source: also search for copies in modified files

http://hg.intevation.org/mercurial/crew/rev/2dbd750b3ddd
changeset:   5279:2dbd750b3ddd
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Sat Sep 01 02:49:18 2007 -0300
summary:     convert: clear the dirstate before a conversion, invalidate it afterwards

http://hg.intevation.org/mercurial/crew/rev/70e9a527cc61
changeset:   5278:70e9a527cc61
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Sat Sep 01 02:49:18 2007 -0300
summary:     convert: avoid dirstate checks; add a test

http://hg.intevation.org/mercurial/crew/rev/a32a8e50d233
changeset:   5277:a32a8e50d233
parent:      5274:694eb9ccb54d
parent:      5276:aea35488ea66
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 31 23:15:44 2007 +0200
summary:     merge with crew

http://hg.intevation.org/mercurial/crew/rev/aea35488ea66
changeset:   5276:aea35488ea66
parent:      5275:d3874a286b51
parent:      5271:5c2ca6d6ab21
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 31 22:31:43 2007 +0200
summary:     merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/d3874a286b51
changeset:   5275:d3874a286b51
parent:      5219:74723744d8e0
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 31 22:31:03 2007 +0200
summary:     fix the dummy 00changelog.i not being copied on clone

http://hg.intevation.org/mercurial/crew/rev/694eb9ccb54d
changeset:   5274:694eb9ccb54d
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Fri Aug 31 13:14:03 2007 +0200
summary:     convert/subversion: Use util.set() instead of set() for python2.3 compatibility

http://hg.intevation.org/mercurial/crew/rev/4287590a63af
changeset:   5273:4287590a63af
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Fri Aug 31 12:54:07 2007 +0200
summary:     Fix \ inside ` problem in test-convert-svn (avoids code duplication, too)

http://hg.intevation.org/mercurial/crew/rev/89696e71bd89
changeset:   5272:89696e71bd89
parent:      5270:6e0f05f6f68d
parent:      5271:5c2ca6d6ab21
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Fri Aug 31 12:40:23 2007 +0200
summary:     merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/5c2ca6d6ab21
changeset:   5271:5c2ca6d6ab21
parent:      5262:bfd73b567b3d
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Fri Aug 31 12:32:18 2007 +0200
summary:     Make test-convert-git compatible with other git versions (tested with 1.4.4.3)

http://hg.intevation.org/mercurial/crew/rev/6e0f05f6f68d
changeset:   5270:6e0f05f6f68d
user:        Thomas Arendsen Hein <thomas at intevation.de>
date:        Fri Aug 31 11:18:29 2007 +0200
summary:     hgweb: Show date of last change for each file in manifest

http://hg.intevation.org/mercurial/crew/rev/a0229e4e4b73
changeset:   5269:a0229e4e4b73
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 31 01:21:31 2007 +0200
summary:     remove unneeded statement

http://hg.intevation.org/mercurial/crew/rev/fae670ee6c6d
changeset:   5268:fae670ee6c6d
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Thu Aug 30 23:54:01 2007 +0200
summary:     kill lonely docstring

http://hg.intevation.org/mercurial/crew/rev/b962f82cfd61
changeset:   5267:b962f82cfd61
user:        Robert Bachmann <rbach at rbach.priv.at>
date:        Thu Aug 30 18:55:56 2007 +0200
summary:     Atom support: replaced xhtml namespace prefix with default namespace

http://hg.intevation.org/mercurial/crew/rev/46c5e1ee8aaa
changeset:   5266:46c5e1ee8aaa
user:        Robert Bachmann <rbach at rbach.priv.at>
date:        Thu Aug 30 16:42:17 2007 +0200
summary:     Added support for the Atom syndication format

http://hg.intevation.org/mercurial/crew/rev/980da86fc66a
changeset:   5265:980da86fc66a
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 29 17:01:10 2007 -0700
summary:     Include . in PYTHONPATH (makes testing unbundled extensions easier)

http://hg.intevation.org/mercurial/crew/rev/b817d17c7ee5
changeset:   5264:b817d17c7ee5
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 29 16:50:21 2007 -0700
summary:     Make run-tests.py work when invoked outside of tests.

http://hg.intevation.org/mercurial/crew/rev/d59ed18ec2d0
changeset:   5263:d59ed18ec2d0
parent:      5261:15a108ad7adb
parent:      5262:bfd73b567b3d
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 29 16:19:27 2007 -0700
summary:     Merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/bfd73b567b3d
changeset:   5262:bfd73b567b3d
parent:      5244:dee573ba79f1
user:        Brendan Cully <brendan at kublai.com>
date:        Wed Aug 29 16:15:23 2007 -0700
summary:     When reverting a file which was renamed, also revert the old name

http://hg.intevation.org/mercurial/crew/rev/15a108ad7adb
changeset:   5261:15a108ad7adb
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Tue Aug 28 23:02:41 2007 -0300
summary:     Avoid a working dir walk while trying to detect copies for diff --git

http://hg.intevation.org/mercurial/crew/rev/0fc16031bb45
changeset:   5260:0fc16031bb45
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Tue Aug 28 22:48:25 2007 -0300
summary:     Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB

http://hg.intevation.org/mercurial/crew/rev/8040f2e4cad0
changeset:   5259:8040f2e4cad0
user:        Brendan Cully <brendan at kublai.com>
date:        Mon Aug 27 17:08:53 2007 -0700
summary:     bundle: fix up lazy reads

http://hg.intevation.org/mercurial/crew/rev/a35756389ef4
changeset:   5258:a35756389ef4
user:        Brendan Cully <brendan at kublai.com>
date:        Mon Aug 27 15:48:21 2007 -0700
summary:     Make bundlerepo lazier

http://hg.intevation.org/mercurial/crew/rev/a4547dfbbf20
changeset:   5257:a4547dfbbf20
parent:      5256:be4835ad9a85
parent:      5255:65dc707606ed
user:        Brendan Cully <brendan at kublai.com>
date:        Mon Aug 27 15:41:31 2007 -0700
summary:     Merge with crew

http://hg.intevation.org/mercurial/crew/rev/be4835ad9a85
changeset:   5256:be4835ad9a85
parent:      5246:585471802a01
user:        Brendan Cully <brendan at kublai.com>
date:        Mon Aug 27 15:39:07 2007 -0700
summary:     convert: new config variable hg.tagsbranch controls which branch tags are committed to

http://hg.intevation.org/mercurial/crew/rev/65dc707606ed
changeset:   5255:65dc707606ed
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Mon Aug 27 14:48:08 2007 -0700
summary:     Push capability checking into protocol-level code.

http://hg.intevation.org/mercurial/crew/rev/b534c502bfb3
changeset:   5254:b534c502bfb3
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Mon Aug 27 14:16:04 2007 -0700
summary:     Turn capabilities into a mutable set, instead of a fixed tuple.

http://hg.intevation.org/mercurial/crew/rev/fd371f99f20b
changeset:   5253:fd371f99f20b
parent:      5252:0b0caffcf175
parent:      5251:37c610c41ed6
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Mon Aug 27 13:38:34 2007 -0700
summary:     Automated merge with http://hg.intevation.org/mercurial/crew

http://hg.intevation.org/mercurial/crew/rev/0b0caffcf175
changeset:   5252:0b0caffcf175
parent:      5246:585471802a01
user:        Bryan O'Sullivan <bos at serpentine.com>
date:        Mon Aug 27 13:38:16 2007 -0700
summary:     convert: document filemap.

http://hg.intevation.org/mercurial/crew/rev/37c610c41ed6
changeset:   5251:37c610c41ed6
user:        Patrick Mezard <pmezard at gmail.com>
date:        Mon Aug 27 22:17:51 2007 +0200
summary:     Test svn repository conversion

http://hg.intevation.org/mercurial/crew/rev/d61e98a82cee
changeset:   5250:d61e98a82cee
user:        Patrick Mezard <pmezard at gmail.com>
date:        Mon Aug 27 22:17:51 2007 +0200
summary:     hghave: detect subversion bindings availability

http://hg.intevation.org/mercurial/crew/rev/d82ebcdf20e1
changeset:   5249:d82ebcdf20e1
user:        Patrick Mezard <pmezard at gmail.com>
date:        Mon Aug 27 22:17:51 2007 +0200
summary:     hghave: detect subversion client and admin tools availability

http://hg.intevation.org/mercurial/crew/rev/c0281c6b40b0
changeset:   5248:c0281c6b40b0
user:        Patrick Mezard <pmezard at gmail.com>
date:        Mon Aug 27 22:17:51 2007 +0200
summary:     hghave: wrap command output matching

http://hg.intevation.org/mercurial/crew/rev/90919a6f5c8f
changeset:   5247:90919a6f5c8f
user:        Patrick Mezard <pmezard at gmail.com>
date:        Mon Aug 27 22:17:51 2007 +0200
summary:     run-tests: append PYTHONPATH instead of overwriting it

http://hg.intevation.org/mercurial/crew/rev/585471802a01
changeset:   5246:585471802a01
user:        Brendan Cully <brendan at kublai.com>
date:        Mon Aug 27 11:56:53 2007 -0700
summary:     convert: svn: check for branch movement in any log entry, not just the first.

http://hg.intevation.org/mercurial/crew/rev/0d28d4e5fe1f
changeset:   5245:0d28d4e5fe1f
parent:      5241:5517aa5aafb0
parent:      5244:dee573ba79f1
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 14:55:33 2007 -0300
summary:     Merge with crew-stable.

http://hg.intevation.org/mercurial/crew/rev/dee573ba79f1
changeset:   5244:dee573ba79f1
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 14:21:04 2007 -0300
summary:     correctly record file-level history when the local side renames a directory

http://hg.intevation.org/mercurial/crew/rev/8050f13772f6
changeset:   5243:8050f13772f6
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 14:21:04 2007 -0300
summary:     Fix theoretical issue in filecommit.

http://hg.intevation.org/mercurial/crew/rev/466323968b23
changeset:   5242:466323968b23
parent:      5240:438ff951df70
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 14:21:04 2007 -0300
summary:     Avoid adding to the changelog executable files added by the second parent.

http://hg.intevation.org/mercurial/crew/rev/5517aa5aafb0
changeset:   5241:5517aa5aafb0
parent:      5234:20770c5d41e0
parent:      5240:438ff951df70
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 02:21:58 2007 -0300
summary:     Merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/438ff951df70
changeset:   5240:438ff951df70
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 01:44:35 2007 -0300
summary:     avoid double slash problem mentioned in issue695

http://hg.intevation.org/mercurial/crew/rev/76c4cadb49fc
changeset:   5239:76c4cadb49fc
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 01:44:35 2007 -0300
summary:     clone: remove "file://" before making the path absolute

http://hg.intevation.org/mercurial/crew/rev/20817af258d8
changeset:   5238:20817af258d8
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 01:44:35 2007 -0300
summary:     pull -u: if "url#rev" was given, update to rev

http://hg.intevation.org/mercurial/crew/rev/fe55e3d6dc0b
changeset:   5237:fe55e3d6dc0b
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 01:44:35 2007 -0300
summary:     clone: if "url#rev" was given, update to rev

http://hg.intevation.org/mercurial/crew/rev/cbe6e263357b
changeset:   5236:cbe6e263357b
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 01:44:35 2007 -0300
summary:     parseurl: also return the revision after the "#"; add a test

http://hg.intevation.org/mercurial/crew/rev/8ede77c2d008
changeset:   5235:8ede77c2d008
parent:      5233:9d7052f17d77
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Mon Aug 27 01:44:35 2007 -0300
summary:     pull -r: pass the revisions as the heads argument of findincoming

http://hg.intevation.org/mercurial/crew/rev/20770c5d41e0
changeset:   5234:20770c5d41e0
parent:      5232:7d3dcdd92a1a
parent:      5233:9d7052f17d77
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Aug 26 19:13:24 2007 +0200
summary:     Merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/9d7052f17d77
changeset:   5233:9d7052f17d77
parent:      5231:ceb6f242fb81
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Aug 26 19:05:19 2007 +0200
summary:     convert: fix /dev/null redirections under Windows

http://hg.intevation.org/mercurial/crew/rev/7d3dcdd92a1a
changeset:   5232:7d3dcdd92a1a
parent:      5227:a1efa71f3ece
parent:      5231:ceb6f242fb81
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Aug 26 16:49:26 2007 +0200
summary:     Merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/ceb6f242fb81
changeset:   5231:ceb6f242fb81
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Aug 26 15:07:13 2007 +0200
summary:     Test git repository conversion

http://hg.intevation.org/mercurial/crew/rev/4fa0f2dff643
changeset:   5230:4fa0f2dff643
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Aug 26 15:35:57 2007 +0200
summary:     hghave: detect git availability

http://hg.intevation.org/mercurial/crew/rev/149742a628fd
changeset:   5229:149742a628fd
user:        Patrick Mezard <pmezard at gmail.com>
date:        Sun Aug 26 14:51:27 2007 +0200
summary:     convert: fix issue702 about GIT_DIR= construct unsupported under Windows.

http://hg.intevation.org/mercurial/crew/rev/39e6deaa8b81
changeset:   5228:39e6deaa8b81
parent:      5219:74723744d8e0
user:        Brendan Cully <brendan at kublai.com>
date:        Sun Jul 01 21:09:08 2007 -0700
summary:     convert: gitcmd wrapper for os.popen

http://hg.intevation.org/mercurial/crew/rev/a1efa71f3ece
changeset:   5227:a1efa71f3ece
user:        Brendan Cully <brendan at kublai.com>
date:        Sat Aug 25 12:25:53 2007 -0700
summary:     Improve extdiff configuration.

http://hg.intevation.org/mercurial/crew/rev/79279b5583c6
changeset:   5226:79279b5583c6
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Sat Aug 25 16:31:37 2007 +0200
summary:     cgi: sys.path.insert should be before importing mercurial

http://hg.intevation.org/mercurial/crew/rev/423f4e8be115
changeset:   5225:423f4e8be115
parent:      5224:9cd6578750b9
parent:      5223:3786ef8877d5
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Sat Aug 25 11:30:59 2007 +0200
summary:     merge with crew

http://hg.intevation.org/mercurial/crew/rev/9cd6578750b9
changeset:   5224:9cd6578750b9
parent:      5220:2b8373bda032
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Sat Aug 25 11:30:11 2007 +0200
summary:     improve error message for 'hg merge' when repo already at branchtip

http://hg.intevation.org/mercurial/crew/rev/3786ef8877d5
changeset:   5223:3786ef8877d5
user:        Brendan Cully <brendan at kublai.com>
date:        Thu Aug 23 22:45:41 2007 -0700
summary:     imerge: add automerge flag to attempt to batch merge all conflicts

http://hg.intevation.org/mercurial/crew/rev/85ba6ab5bd3a
changeset:   5222:85ba6ab5bd3a
parent:      5221:8860f29447c1
parent:      5220:2b8373bda032
user:        Brendan Cully <brendan at kublai.com>
date:        Thu Aug 23 19:52:15 2007 -0700
summary:     Merge with crew

http://hg.intevation.org/mercurial/crew/rev/8860f29447c1
changeset:   5221:8860f29447c1
parent:      5213:988ed47d9d65
user:        Brendan Cully <brendan at kublai.com>
date:        Thu Aug 23 19:51:59 2007 -0700
summary:     imerge: fix ancestor calculation

http://hg.intevation.org/mercurial/crew/rev/2b8373bda032
changeset:   5220:2b8373bda032
parent:      5218:5b1f5a143c8b
parent:      5219:74723744d8e0
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 24 00:56:56 2007 +0200
summary:     merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/74723744d8e0
changeset:   5219:74723744d8e0
parent:      5217:551958d5082c
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 24 00:56:08 2007 +0200
summary:     fix test-permissions output

http://hg.intevation.org/mercurial/crew/rev/5b1f5a143c8b
changeset:   5218:5b1f5a143c8b
parent:      5216:335696e2a58f
parent:      5217:551958d5082c
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 24 00:53:16 2007 +0200
summary:     merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/551958d5082c
changeset:   5217:551958d5082c
parent:      5215:b0bc8cf41ffc
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 24 00:52:28 2007 +0200
summary:     testcase for issue705 (fixed by 316ce5e85b3e)

http://hg.intevation.org/mercurial/crew/rev/335696e2a58f
changeset:   5216:335696e2a58f
parent:      5213:988ed47d9d65
parent:      5215:b0bc8cf41ffc
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 24 00:39:59 2007 +0200
summary:     merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/b0bc8cf41ffc
changeset:   5215:b0bc8cf41ffc
parent:      5214:316ce5e85b3e
parent:      5211:bddb4ff134c0
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 24 00:39:16 2007 +0200
summary:     merge with -stable

http://hg.intevation.org/mercurial/crew/rev/316ce5e85b3e
changeset:   5214:316ce5e85b3e
parent:      5179:156f4c8a12aa
user:        Benoit Boissinot <benoit.boissinot at ens-lyon.org>
date:        Fri Aug 24 00:38:08 2007 +0200
summary:     check exec: return fallback in case of error during the check

http://hg.intevation.org/mercurial/crew/rev/988ed47d9d65
changeset:   5213:988ed47d9d65
user:        Brendan Cully <brendan at kublai.com>
date:        Thu Aug 23 13:59:52 2007 -0700
summary:     mq: some improvements to header rewriting (closes #690)

http://hg.intevation.org/mercurial/crew/rev/b772c0b9f0bd
changeset:   5212:b772c0b9f0bd
parent:      5210:90d9ec0dc69d
parent:      5211:bddb4ff134c0
user:        Brendan Cully <brendan at kublai.com>
date:        Thu Aug 23 12:24:54 2007 -0700
summary:     Merge with crew-stable

http://hg.intevation.org/mercurial/crew/rev/bddb4ff134c0
changeset:   5211:bddb4ff134c0
parent:      5206:0f6a1bdf89fb
user:        Brendan Cully <brendan at kublai.com>
date:        Thu Aug 23 12:23:07 2007 -0700
summary:     Do not lose previous tags when adding a tag in raw mode

http://hg.intevation.org/mercurial/crew/rev/90d9ec0dc69d
changeset:   5210:90d9ec0dc69d
user:        Alexis S. L. Carvalho <alexis at cecm.usp.br>
date:        Thu Aug 23 01:48:29 2007 -0300
summary:     merge: forcefully mark files that we get from the second parent as dirty

-- 
Repository URL: http://hg.intevation.org/mercurial/crew


More information about the Mercurial-devel mailing list