mercurial-crew-with-dirclash: Changelog

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changelog

Sat, 14 Oct 2006 10:53:29 +0200 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)

changeset

Thomas Arendsen Hein <thomas@intevation.de> [Sat, 14 Oct 2006 10:53:29 +0200] rev 3389

Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)

Sat, 14 Oct 2006 10:39:40 +0200 merge with upstream

changeset

Thomas Arendsen Hein <thomas@intevation.de> [Sat, 14 Oct 2006 10:39:40 +0200] rev 3388

merge with upstream

Fri, 13 Oct 2006 17:58:04 -0500 merge: update dirstate correctly for non-branchmerge updates

changeset

Matt Mackall <mpm@selenic.com> [Fri, 13 Oct 2006 17:58:04 -0500] rev 3387

merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update

Fri, 13 Oct 2006 15:34:35 -0300 use short hashes with diff -v

changeset

Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 13 Oct 2006 15:34:35 -0300] rev 3386

use short hashes with diff -v

Fri, 13 Oct 2006 11:17:17 -0700 Use manifest rev instead of changelog rev for linear manifest test

changeset

Brendan Cully <brendan@kublai.com> [Fri, 13 Oct 2006 11:17:17 -0700] rev 3385

Use manifest rev instead of changelog rev for linear manifest test

Fri, 13 Oct 2006 19:35:08 +0200 Removed unused imports of mdiff and templater from ui.py

changeset

Thomas Arendsen Hein <thomas@intevation.de> [Fri, 13 Oct 2006 19:35:08 +0200] rev 3384

Removed unused imports of mdiff and templater from ui.py

(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 tip

mercurial-crew-with-dirclash

RSS Atom