Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6298
normallookup: during merges, restore the state saved by remove
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6297
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6296
debugstate: add --nodates
This can be useful for tests.
Patrick Mezard <pmezard@gmail.com> [Mon, 17 Mar 2008 23:36:45 +0100] rev 6295
patch: fix corner case with update + copy patch handling (issue 937)
The self patching of files when diffed with a backup is a bit peculiar to me.
It makes sense in mpatch, that's less clear in mercurial patching code. Let's
document and preserve it for now.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 14:51:41 -0700] rev 6294
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 14:51:36 -0700] rev 6293
Backed out changeset 4b81eecc8aa2
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 08:04:09 -0700] rev 6292
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 07:59:23 -0700] rev 6291
Backed out changeset 91ac1726730a
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:31 -0700] rev 6290
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:04 -0700] rev 6289
issue 1003: send all data properly