Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rawcommit1.out @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 8feb33c2d153
children
line wrap: on
line source

05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644   a
54837d97f2932a8194e69745a280a2c11e61ff9c 644   b
(the rawcommit command is deprecated)
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644   a
54837d97f2932a8194e69745a280a2c11e61ff9c 644   b
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644   c
changeset:   2:e110db3db549
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
files:       c
description:
2


(the rawcommit command is deprecated)
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644   a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644   c
changeset:   3:20652cf30cc0
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
files:       b
description:
3


(the rawcommit command is deprecated)
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644   a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644   c
changeset:   4:42556b925639
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
files:       a
description:
4


(the rawcommit command is deprecated)
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644   a
54837d97f2932a8194e69745a280a2c11e61ff9c 644   b
3570202ceac2b52517df64ebd0a062cb0d8fe33a 644   c
changeset:   4:42556b925639
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
files:       a
description:
4


(the rawcommit command is deprecated)
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644   a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644   c
changeset:   6:8a0c9254b0ab
tag:         tip
parent:      4:42556b925639
parent:      5:f56d4c64ab98
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
description:
6


(the rawcommit command is deprecated)
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644   a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644   c
changeset:   7:a5a6e1f312b9
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
description:
7