Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-encode.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 b2ae81a7df29
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
1 %% no changes
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
2 %% no changes
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
3 %% uncompressed contents in repo
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
4 this is a test
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
5 %% uncompress our working dir copy
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
6 this is a test
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1258
diff changeset
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
8 %% uncompress our new working dir copy
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
9 this is a test