Mercurial > hg-stable
annotate tests/test-convert-mtn.t @ 13480:69418d4525d1 stable
convert/svn: abort operation when python bindings are not available
Subversion python bindings check was not present in svn_sink source
class which made it fail while using svn as destination repository.
Added a more maintainble svn bindings check for svn_source and svn_sink
classes.
author | Azhagu Selvan SP <tamizhgeek@gmail.com> |
---|---|
date | Thu, 24 Feb 2011 01:14:15 +0530 |
parents | 742bb15d94a8 |
children | 7fc79055a62b |
rev | line source |
---|---|
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
2 $ "$TESTDIR/hghave" mtn || exit 80 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
3 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
4 Monotone directory is called .monotone on *nix and monotone |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
5 on Windows. Having a variable here ease test patching. |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
6 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
7 $ mtndir=.monotone |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
8 $ echo "[extensions]" >> $HGRCPATH |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
9 $ echo "convert=" >> $HGRCPATH |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
10 $ echo 'graphlog =' >> $HGRCPATH |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
11 $ HOME=`pwd`/do_not_use_HOME_mtn; export HOME |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
12 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
13 Windows version of monotone home |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
14 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
15 $ APPDATA=$HOME; export APPDATA |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
16 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
17 tedious monotone keys configuration |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
18 The /dev/null redirection is necessary under Windows, or |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
19 it complains about home directory permissions |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
20 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
21 $ mtn --quiet genkey test@selenic.com 1>/dev/null 2>&1 <<EOF |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
22 > passphrase |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
23 > passphrase |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
24 > EOF |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
25 $ cat >> $HOME/$mtndir/monotonerc <<EOF |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
26 > function get_passphrase(keypair_id) |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
27 > return "passphrase" |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
28 > end |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
29 > EOF |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
30 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
31 create monotone repository |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
32 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
33 $ mtn db init --db=repo.mtn |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
34 $ mtn --db=repo.mtn --branch=com.selenic.test setup workingdir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
35 $ cd workingdir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
36 $ echo a > a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
37 $ mkdir dir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
38 $ echo b > dir/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
39 $ echo d > dir/d |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
40 $ python -c 'file("bin", "wb").write("a\\x00b")' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
41 $ echo c > c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
42 $ mtn add a dir/b dir/d c bin |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
43 mtn: adding a to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
44 mtn: adding bin to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
45 mtn: adding c to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
46 mtn: adding dir to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
47 mtn: adding dir/b to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
48 mtn: adding dir/d to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
49 $ mtn ci -m initialize |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
50 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
51 mtn: committed revision 0f6e5e4f2e7d2a8ef312408f57618abf026afd90 |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
52 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
53 update monotone working directory |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
54 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
55 $ mtn mv a dir/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
56 mtn: skipping dir, already accounted for in workspace |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
57 mtn: renaming a to dir/a in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
58 $ echo a >> dir/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
59 $ echo b >> dir/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
60 $ mtn drop c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
61 mtn: dropping c from workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
62 $ python -c 'file("bin", "wb").write("b\\x00c")' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
63 $ mtn ci -m update1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
64 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
65 mtn: committed revision 51d0a982464573a2a2cf5ee2c9219c652aaebeff |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
66 $ cd .. |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
67 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
68 convert once |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
69 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
70 $ hg convert -s mtn repo.mtn |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
71 assuming destination repo.mtn-hg |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
72 initializing destination repo.mtn-hg repository |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
73 scanning source... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
74 sorting... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
75 converting... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
76 1 initialize |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
77 0 update1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
78 $ cd workingdir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
79 $ echo e > e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
80 $ mtn add e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
81 mtn: adding e to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
82 $ mtn drop dir/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
83 mtn: dropping dir/b from workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
84 $ mtn mv bin bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
85 mtn: renaming bin to bin2 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
86 $ mtn ci -m 'update2 "with" quotes' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
87 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
88 mtn: committed revision ebe58335d85d8cb176b6d0a12be04f5314b998da |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
89 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
90 test directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
91 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
92 $ mkdir -p dir1/subdir1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
93 $ mkdir -p dir1/subdir2_other |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
94 $ echo file1 > dir1/subdir1/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
95 $ echo file2 > dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
96 $ mtn add dir1/subdir1/file1 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
97 mtn: adding dir1 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
98 mtn: adding dir1/subdir1 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
99 mtn: adding dir1/subdir1/file1 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
100 mtn: adding dir1/subdir2_other to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
101 mtn: adding dir1/subdir2_other/file1 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
102 $ mtn ci -m createdir1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
103 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
104 mtn: committed revision a8d62bc04fee4d2936d28e98bbcc81686dd74306 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
105 $ mtn rename dir1/subdir1 dir1/subdir2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
106 mtn: skipping dir1, already accounted for in workspace |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
107 mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
108 $ mtn ci -m movedir1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
109 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
110 mtn: committed revision 2c3d241bbbfe538b1b51d910f5676407e3f4d3a6 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
111 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
112 test subdirectory move |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
113 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
114 $ mtn mv dir dir2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
115 mtn: renaming dir to dir2 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
116 $ echo newfile > dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
117 $ mtn drop dir2/d |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
118 mtn: dropping dir2/d from workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
119 $ mtn add dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
120 mtn: adding dir2/newfile to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
121 $ mtn ci -m movedir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
122 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
123 mtn: committed revision fdb5a02dae8bfce3a79b3393680af471016e1b4c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
124 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
125 Test directory removal with empty directory |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
126 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
127 $ mkdir dir2/dir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
128 $ mkdir dir2/dir/subdir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
129 $ echo f > dir2/dir/subdir/f |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
130 $ mkdir dir2/dir/emptydir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
131 $ mtn add --quiet -R dir2/dir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
132 $ mtn ci -m emptydir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
133 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
134 mtn: committed revision 8bbf76d717001d24964e4604739fdcd0f539fc88 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
135 $ mtn drop -R dir2/dir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
136 mtn: dropping dir2/dir/subdir/f from workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
137 mtn: dropping dir2/dir/subdir from workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
138 mtn: dropping dir2/dir/emptydir from workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
139 mtn: dropping dir2/dir from workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
140 $ mtn ci -m dropdirectory |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
141 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
142 mtn: committed revision 2323d4bc324e6c82628dc04d47a9fd32ad24e322 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
143 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
144 test directory and file move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
145 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
146 $ mkdir -p dir3/d1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
147 $ echo a > dir3/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
148 $ mtn add dir3/a dir3/d1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
149 mtn: adding dir3 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
150 mtn: adding dir3/a to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
151 mtn: adding dir3/d1 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
152 $ mtn ci -m dirfilemove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
153 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
154 mtn: committed revision 47b192f720faa622f48c68d1eb075b26d405aa8b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
155 $ mtn mv dir3/a dir3/d1/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
156 mtn: skipping dir3/d1, already accounted for in workspace |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
157 mtn: renaming dir3/a to dir3/d1/a in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
158 $ mtn mv dir3/d1 dir3/d2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
159 mtn: skipping dir3, already accounted for in workspace |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
160 mtn: renaming dir3/d1 to dir3/d2 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
161 $ mtn ci -m dirfilemove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
162 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
163 mtn: committed revision 8b543a400d3ee7f6d4bb1835b9b9e3747c8cb632 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
164 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
165 test directory move into another directory move |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
166 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
167 $ mkdir dir4 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
168 $ mkdir dir5 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
169 $ echo a > dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
170 $ mtn add dir4/a dir5 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
171 mtn: adding dir4 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
172 mtn: adding dir4/a to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
173 mtn: adding dir5 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
174 $ mtn ci -m dirdirmove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
175 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
176 mtn: committed revision 466e0b2afc7a55aa2b4ab2f57cb240bb6cd66fc7 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
177 $ mtn mv dir5 dir6 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
178 mtn: renaming dir5 to dir6 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
179 $ mtn mv dir4 dir6/dir4 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
180 mtn: skipping dir6, already accounted for in workspace |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
181 mtn: renaming dir4 to dir6/dir4 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
182 $ mtn ci -m dirdirmove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
183 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
184 mtn: committed revision 3d1f77ebad0c23a5d14911be3b670f990991b749 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
185 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
186 test diverging directory moves |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
187 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
188 $ mkdir -p dir7/dir9/dir8 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
189 $ echo a > dir7/dir9/dir8/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
190 $ echo b > dir7/dir9/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
191 $ echo c > dir7/c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
192 $ mtn add -R dir7 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
193 mtn: adding dir7 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
194 mtn: adding dir7/c to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
195 mtn: adding dir7/dir9 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
196 mtn: adding dir7/dir9/b to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
197 mtn: adding dir7/dir9/dir8 to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
198 mtn: adding dir7/dir9/dir8/a to workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
199 $ mtn ci -m divergentdirmove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
200 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
201 mtn: committed revision 08a08511f18b428d840199b062de90d0396bc2ed |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
202 $ mtn mv dir7 dir7-2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
203 mtn: renaming dir7 to dir7-2 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
204 $ mtn mv dir7-2/dir9 dir9-2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
205 mtn: renaming dir7-2/dir9 to dir9-2 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
206 $ mtn mv dir9-2/dir8 dir8-2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
207 mtn: renaming dir9-2/dir8 to dir8-2 in workspace manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
208 $ mtn ci -m divergentdirmove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
209 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
210 mtn: committed revision 4a736634505795f17786fffdf2c9cbf5b11df6f6 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
211 $ cd .. |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
212 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
213 convert incrementally |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
214 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
215 $ hg convert -s mtn repo.mtn |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
216 assuming destination repo.mtn-hg |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
217 scanning source... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
218 sorting... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
219 converting... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
220 11 update2 "with" quotes |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
221 10 createdir1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
222 9 movedir1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
223 8 movedir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
224 7 emptydir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
225 6 dropdirectory |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
226 5 dirfilemove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
227 4 dirfilemove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
228 3 dirdirmove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
229 2 dirdirmove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
230 1 divergentdirmove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
231 0 divergentdirmove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
232 $ glog() |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
233 > { |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
234 > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
235 > } |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
236 $ cd repo.mtn-hg |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
237 $ hg up -C |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
238 11 files updated, 0 files merged, 0 files removed, 0 files unresolved |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
239 $ glog |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
240 @ 13 "divergentdirmove2" files: dir7-2/c dir7/c dir7/dir9/b dir7/dir9/dir8/a dir8-2/a dir9-2/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
241 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
242 o 12 "divergentdirmove" files: dir7/c dir7/dir9/b dir7/dir9/dir8/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
243 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
244 o 11 "dirdirmove2" files: dir4/a dir6/dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
245 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
246 o 10 "dirdirmove" files: dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
247 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
248 o 9 "dirfilemove2" files: dir3/a dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
249 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
250 o 8 "dirfilemove" files: dir3/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
251 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
252 o 7 "dropdirectory" files: dir2/dir/subdir/f |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
253 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
254 o 6 "emptydir" files: dir2/dir/subdir/f |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
255 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
256 o 5 "movedir" files: dir/a dir/d dir2/a dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
257 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
258 o 4 "movedir1" files: dir1/subdir1/file1 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
259 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
260 o 3 "createdir1" files: dir1/subdir1/file1 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
261 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
262 o 2 "update2 "with" quotes" files: bin bin2 dir/b e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
263 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
264 o 1 "update1" files: a bin c dir/a dir/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
265 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
266 o 0 "initialize" files: a bin c dir/b dir/d |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
267 |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
268 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
269 manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
270 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
271 $ hg manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
272 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
273 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
274 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
275 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
276 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
277 dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
278 dir6/dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
279 dir7-2/c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
280 dir8-2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
281 dir9-2/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
282 e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
283 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
284 contents |
8050
087cc65bebff
convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents:
6873
diff
changeset
|
285 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
286 $ cat dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
287 a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
288 a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
289 $ test -d dir2/dir && echo 'removed dir2/dir is still there!' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
290 [1] |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
291 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
292 file move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
293 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
294 $ hg log -v -C -r 1 | grep copies |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
295 copies: dir/a (a) |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
296 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
297 check directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
298 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
299 $ hg manifest -r 4 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
300 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
301 dir/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
302 dir/d |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
303 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
304 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
305 e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
306 $ test -d dir1/subdir2 || echo 'new dir1/subdir2 does not exist!' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
307 $ test -d dir1/subdir1 && echo 'renamed dir1/subdir1 is still there!' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
308 [1] |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
309 $ hg log -v -C -r 4 | grep copies |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
310 copies: dir1/subdir2/file1 (dir1/subdir1/file1) |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
311 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
312 check file remove with directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
313 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
314 $ hg manifest -r 5 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
315 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
316 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
317 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
318 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
319 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
320 e |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
321 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
322 check file move with directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
323 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
324 $ hg manifest -r 9 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
325 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
326 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
327 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
328 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
329 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
330 dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
331 e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
332 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
333 check file directory directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
334 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
335 $ hg manifest -r 11 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
336 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
337 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
338 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
339 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
340 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
341 dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
342 dir6/dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
343 e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
344 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
345 check divergent directory moves |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
346 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
347 $ hg manifest -r 13 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
348 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
349 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
350 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
351 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
352 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
353 dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
354 dir6/dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
355 dir7-2/c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
356 dir8-2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
357 dir9-2/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
358 e |