Mercurial: Changelog

Mercurial Mercurial > hg / changelog

Wed, 11 Oct 2006 16:35:09 +0200 fix traceback of extdiff after a merge

changeset

Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 16:35:09 +0200] rev 3330

fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff

Tue, 10 Oct 2006 14:48:26 -0700 Don't generate git diff header for empty diffs

changeset

Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 14:48:26 -0700] rev 3329

Don't generate git diff header for empty diffs

Tue, 10 Oct 2006 10:54:22 -0700 Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /)

changeset

Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 10:54:22 -0700] rev 3328

Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /)

Tue, 10 Oct 2006 10:28:20 -0700 NWI base URL detection fixes

changeset

Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 10:28:20 -0700] rev 3327

NWI base URL detection fixes

Wed, 11 Oct 2006 15:52:08 -0500 make manifest-merging test reproduceable

changeset

Matt Mackall <mpm@selenic.com> [Wed, 11 Oct 2006 15:52:08 -0500] rev 3326

make manifest-merging test reproduceable

Tue, 10 Oct 2006 21:03:24 +0300 Revert changeset c67920d78248.

changeset

Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 10 Oct 2006 21:03:24 +0300] rev 3325

Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:

Tue, 10 Oct 2006 11:47:19 +0200 merge with upstream

changeset

Thomas Arendsen Hein <thomas@intevation.de> [Tue, 10 Oct 2006 11:47:19 +0200] rev 3324

merge with upstream

(0) -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip

Mercurial

RSS Atom