mercurial/crew at 5223: 14 outgoing changesets
Mercurial Commits
hg at intevation.org
Fri Aug 24 06:00:07 CDT 2007
14 outgoing changesets in mercurial/crew:
http://hg.intevation.org/mercurial/crew/rev/3786ef8877d5
changeset: 5223:3786ef8877d5
tag: tip
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