Mercurial > hg
annotate tests/test-empty.t @ 14050:9e8a9d45945c stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
parents | 4134686b83e1 |
children | f2719b387380 |
rev | line source |
---|---|
11743 | 1 Create an empty repo: |
2 | |
3 $ hg init a | |
4 $ cd a | |
5 | |
6 Try some commands: | |
7 | |
8 $ hg log | |
9 $ hg grep wah | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11743
diff
changeset
|
10 [1] |
11743 | 11 $ hg manifest |
12 $ hg verify | |
13 checking changesets | |
14 checking manifests | |
15 crosschecking files in changesets and manifests | |
16 checking files | |
17 0 files, 0 changesets, 0 total revisions | |
18 | |
19 Check the basic files created: | |
20 | |
21 $ ls .hg | |
22 00changelog.i | |
23 requires | |
24 store | |
25 | |
26 Should be empty: | |
1338 | 27 |
11743 | 28 $ ls .hg/store |
29 | |
30 Poke at a clone: | |
6944
7e5f3480c45b
fix regression on empty repo cloning introduced by 0642d9d7ec80
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1338
diff
changeset
|
31 |
11743 | 32 $ cd .. |
33 $ hg clone a b | |
34 updating to branch default | |
35 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 $ cd b | |
37 $ hg verify | |
38 checking changesets | |
39 checking manifests | |
40 crosschecking files in changesets and manifests | |
41 checking files | |
42 0 files, 0 changesets, 0 total revisions | |
43 $ ls .hg | |
44 00changelog.i | |
45 branch | |
46 dirstate | |
47 hgrc | |
48 requires | |
49 store | |
50 | |
51 Should be empty: | |
52 | |
53 $ ls .hg/store |