Mercurial > hg
annotate tests/test-convert-mtn.t @ 28573:6a42564081cb
shelve: adds restoring newly created branch (issue5048) (BC)
Before this patch shelve never preserved branch information,
so after applying unshelve branch was the same as it was
on working copy no matter in which branch shelve took place.
This patch makes bare shelving(with no files specified, without
interactive,include and exclude option) remembers information if
the working directory was on newly created branch ,in other words
working directory was on different branch than its first parent.
In this situation unshelving restores branch information to the working
directory.
author | liscju <piotr.listkiewicz@gmail.com> |
---|---|
date | Wed, 10 Feb 2016 02:23:27 +0100 |
parents | 4d2b9b304ad0 |
children | c2e4e59aaea6 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20117
diff
changeset
|
1 #require mtn |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
3 Monotone directory is called .monotone on *nix and monotone |
17449
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
4 on Windows. |
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
5 |
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
6 #if windows |
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
7 |
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
8 $ mtndir=monotone |
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
9 |
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
10 #else |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
11 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
12 $ mtndir=.monotone |
17449
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
13 |
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
14 #endif |
3d1b64bc8150
test-convert-mtn.t: use #if to set mtndir to the correct value
Patrick Mezard <patrick@mezard.eu>
parents:
14394
diff
changeset
|
15 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
16 $ echo "[extensions]" >> $HGRCPATH |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
17 $ echo "convert=" >> $HGRCPATH |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
18 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
19 Windows version of monotone home |
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 $ APPDATA=$HOME; export APPDATA |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
22 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
23 tedious monotone keys configuration |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
24 The /dev/null redirection is necessary under Windows, or |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
25 it complains about home directory permissions |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
26 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
27 $ 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
|
28 > passphrase |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
29 > passphrase |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
30 > EOF |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
31 $ cat >> $HOME/$mtndir/monotonerc <<EOF |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
32 > function get_passphrase(keypair_id) |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
33 > return "passphrase" |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
34 > end |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
35 > EOF |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
36 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
37 create monotone repository |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
38 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
39 $ mtn db init --db=repo.mtn |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
40 $ 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
|
41 $ cd workingdir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
42 $ echo a > a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
43 $ mkdir dir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
44 $ echo b > dir/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
45 $ echo d > dir/d |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22046
diff
changeset
|
46 $ $PYTHON -c 'file("bin", "wb").write("a\\x00b")' |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
47 $ echo c > c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
48 $ mtn add a dir/b dir/d c bin |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
49 mtn: adding 'a' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
50 mtn: adding 'bin' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
51 mtn: adding 'c' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
52 mtn: adding 'dir' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
53 mtn: adding 'dir/b' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
54 mtn: adding 'dir/d' to workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
55 $ mtn ci -m initialize |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
56 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
57 mtn: committed revision 0f6e5e4f2e7d2a8ef312408f57618abf026afd90 |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
58 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
59 update monotone working directory |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
60 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
61 $ mtn mv a dir/a |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
62 mtn: skipping 'dir', already accounted for in workspace |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
63 mtn: renaming 'a' to 'dir/a' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
64 $ echo a >> dir/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
65 $ echo b >> dir/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
66 $ mtn drop c |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
67 mtn: dropping 'c' from workspace manifest |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22046
diff
changeset
|
68 $ $PYTHON -c 'file("bin", "wb").write("b\\x00c")' |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
69 $ mtn ci -m update1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
70 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
71 mtn: committed revision 51d0a982464573a2a2cf5ee2c9219c652aaebeff |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
72 $ cd .. |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
73 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
74 convert once |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
75 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
76 $ hg convert -s mtn repo.mtn |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
77 assuming destination repo.mtn-hg |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
78 initializing destination repo.mtn-hg repository |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
79 scanning source... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
80 sorting... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
81 converting... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
82 1 initialize |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
83 0 update1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
84 $ cd workingdir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
85 $ echo e > e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
86 $ mtn add e |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
87 mtn: adding 'e' to workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
88 $ mtn drop dir/b |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
89 mtn: dropping 'dir/b' from workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
90 $ mtn mv bin bin2 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
91 mtn: renaming 'bin' to 'bin2' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
92 $ mtn ci -m 'update2 "with" quotes' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
93 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
94 mtn: committed revision ebe58335d85d8cb176b6d0a12be04f5314b998da |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
95 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
96 test directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
97 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
98 $ mkdir -p dir1/subdir1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
99 $ mkdir -p dir1/subdir2_other |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
100 $ echo file1 > dir1/subdir1/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
101 $ echo file2 > dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
102 $ mtn add dir1/subdir1/file1 dir1/subdir2_other/file1 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
103 mtn: adding 'dir1' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
104 mtn: adding 'dir1/subdir1' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
105 mtn: adding 'dir1/subdir1/file1' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
106 mtn: adding 'dir1/subdir2_other' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
107 mtn: adding 'dir1/subdir2_other/file1' to workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
108 $ mtn ci -m createdir1 |
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 a8d62bc04fee4d2936d28e98bbcc81686dd74306 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
111 $ mtn rename dir1/subdir1 dir1/subdir2 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
112 mtn: skipping 'dir1', already accounted for in workspace |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
113 mtn: renaming 'dir1/subdir1' to 'dir1/subdir2' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
114 $ mtn ci -m movedir1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
115 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
116 mtn: committed revision 2c3d241bbbfe538b1b51d910f5676407e3f4d3a6 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
117 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
118 test subdirectory move |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
119 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
120 $ mtn mv dir dir2 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
121 mtn: renaming 'dir' to 'dir2' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
122 $ echo newfile > dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
123 $ mtn drop dir2/d |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
124 mtn: dropping 'dir2/d' from workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
125 $ mtn add dir2/newfile |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
126 mtn: adding 'dir2/newfile' to workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
127 $ mtn ci -m movedir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
128 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
129 mtn: committed revision fdb5a02dae8bfce3a79b3393680af471016e1b4c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
130 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
131 Test directory removal with empty directory |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
132 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
133 $ mkdir dir2/dir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
134 $ mkdir dir2/dir/subdir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
135 $ echo f > dir2/dir/subdir/f |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
136 $ mkdir dir2/dir/emptydir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
137 $ mtn add --quiet -R dir2/dir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
138 $ mtn ci -m emptydir |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
139 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
140 mtn: committed revision 8bbf76d717001d24964e4604739fdcd0f539fc88 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
141 $ mtn drop -R dir2/dir |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
142 mtn: dropping 'dir2/dir/subdir/f' from workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
143 mtn: dropping 'dir2/dir/subdir' from workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
144 mtn: dropping 'dir2/dir/emptydir' from workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
145 mtn: dropping 'dir2/dir' from workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
146 $ mtn ci -m dropdirectory |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
147 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
148 mtn: committed revision 2323d4bc324e6c82628dc04d47a9fd32ad24e322 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
149 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
150 test directory and file move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
151 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
152 $ mkdir -p dir3/d1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
153 $ echo a > dir3/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
154 $ mtn add dir3/a dir3/d1 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
155 mtn: adding 'dir3' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
156 mtn: adding 'dir3/a' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
157 mtn: adding 'dir3/d1' to workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
158 $ mtn ci -m dirfilemove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
159 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
160 mtn: committed revision 47b192f720faa622f48c68d1eb075b26d405aa8b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
161 $ mtn mv dir3/a dir3/d1/a |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
162 mtn: skipping 'dir3/d1', already accounted for in workspace |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
163 mtn: renaming 'dir3/a' to 'dir3/d1/a' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
164 $ mtn mv dir3/d1 dir3/d2 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
165 mtn: skipping 'dir3', already accounted for in workspace |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
166 mtn: renaming 'dir3/d1' to 'dir3/d2' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
167 $ mtn ci -m dirfilemove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
168 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
169 mtn: committed revision 8b543a400d3ee7f6d4bb1835b9b9e3747c8cb632 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
170 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
171 test directory move into another directory move |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
172 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
173 $ mkdir dir4 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
174 $ mkdir dir5 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
175 $ echo a > dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
176 $ mtn add dir4/a dir5 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
177 mtn: adding 'dir4' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
178 mtn: adding 'dir4/a' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
179 mtn: adding 'dir5' to workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
180 $ mtn ci -m dirdirmove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
181 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
182 mtn: committed revision 466e0b2afc7a55aa2b4ab2f57cb240bb6cd66fc7 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
183 $ mtn mv dir5 dir6 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
184 mtn: renaming 'dir5' to 'dir6' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
185 $ mtn mv dir4 dir6/dir4 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
186 mtn: skipping 'dir6', already accounted for in workspace |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
187 mtn: renaming 'dir4' to 'dir6/dir4' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
188 $ mtn ci -m dirdirmove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
189 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
190 mtn: committed revision 3d1f77ebad0c23a5d14911be3b670f990991b749 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
191 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
192 test diverging directory moves |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
193 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
194 $ mkdir -p dir7/dir9/dir8 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
195 $ echo a > dir7/dir9/dir8/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
196 $ echo b > dir7/dir9/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
197 $ echo c > dir7/c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
198 $ mtn add -R dir7 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
199 mtn: adding 'dir7' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
200 mtn: adding 'dir7/c' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
201 mtn: adding 'dir7/dir9' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
202 mtn: adding 'dir7/dir9/b' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
203 mtn: adding 'dir7/dir9/dir8' to workspace manifest |
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
204 mtn: adding 'dir7/dir9/dir8/a' to workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
205 $ mtn ci -m divergentdirmove |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
206 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
207 mtn: committed revision 08a08511f18b428d840199b062de90d0396bc2ed |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
208 $ mtn mv dir7 dir7-2 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
209 mtn: renaming 'dir7' to 'dir7-2' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
210 $ mtn mv dir7-2/dir9 dir9-2 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
211 mtn: renaming 'dir7-2/dir9' to 'dir9-2' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
212 $ mtn mv dir9-2/dir8 dir8-2 |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
213 mtn: renaming 'dir9-2/dir8' to 'dir8-2' in workspace manifest |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
214 $ mtn ci -m divergentdirmove2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
215 mtn: beginning commit on branch 'com.selenic.test' |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
216 mtn: committed revision 4a736634505795f17786fffdf2c9cbf5b11df6f6 |
13779
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
217 |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
218 test large file support (> 32kB) |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
219 |
17450
9c362a497eae
test-convert-mtn.t: generate files in binary mode
Patrick Mezard <patrick@mezard.eu>
parents:
17449
diff
changeset
|
220 >>> fp = file('large-file', 'wb') |
9c362a497eae
test-convert-mtn.t: generate files in binary mode
Patrick Mezard <patrick@mezard.eu>
parents:
17449
diff
changeset
|
221 >>> for x in xrange(10000): fp.write('%d\n' % x) |
9c362a497eae
test-convert-mtn.t: generate files in binary mode
Patrick Mezard <patrick@mezard.eu>
parents:
17449
diff
changeset
|
222 >>> fp.close() |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22947
diff
changeset
|
223 $ md5sum.py large-file |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
224 5d6de8a95c3b6bf9e0ffb808ba5299c1 large-file |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
225 $ mtn add large-file |
14394
5b98d7416a32
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com>
parents:
13792
diff
changeset
|
226 mtn: adding 'large-file' to workspace manifest |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
227 $ mtn ci -m largefile |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
228 mtn: beginning commit on branch 'com.selenic.test' |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
229 mtn: committed revision f0a20fecd10dc4392d18fe69a03f1f4919d3387b |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
230 |
13779
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
231 test suspending (closing a branch) |
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
232 |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
233 $ mtn suspend f0a20fecd10dc4392d18fe69a03f1f4919d3387b 2> /dev/null |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
234 $ cd .. |
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 convert incrementally |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
237 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
238 $ hg convert -s mtn repo.mtn |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
239 assuming destination repo.mtn-hg |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
240 scanning source... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
241 sorting... |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
242 converting... |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
243 12 update2 "with" quotes |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
244 11 createdir1 |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
245 10 movedir1 |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
246 9 movedir |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
247 8 emptydir |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
248 7 dropdirectory |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
249 6 dirfilemove |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
250 5 dirfilemove2 |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
251 4 dirdirmove |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
252 3 dirdirmove2 |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
253 2 divergentdirmove |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
254 1 divergentdirmove2 |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
255 0 largefile |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
256 $ glog() |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
257 > { |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
17450
diff
changeset
|
258 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
12532
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 $ cd repo.mtn-hg |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
261 $ hg up -C |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
262 12 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
263 $ glog |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
264 @ 14 "largefile" files: large-file |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
265 | |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
266 o 13 "divergentdirmove2" files: dir7-2/c dir7/c dir7/dir9/b dir7/dir9/dir8/a dir8-2/a dir9-2/b |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
267 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
268 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
|
269 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
270 o 11 "dirdirmove2" files: dir4/a dir6/dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
271 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
272 o 10 "dirdirmove" files: dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
273 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
274 o 9 "dirfilemove2" files: dir3/a dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
275 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
276 o 8 "dirfilemove" files: dir3/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
277 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
278 o 7 "dropdirectory" files: dir2/dir/subdir/f |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
279 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
280 o 6 "emptydir" files: dir2/dir/subdir/f |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
281 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
282 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
|
283 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
284 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
|
285 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
286 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
|
287 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
288 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
|
289 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
290 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
|
291 | |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
292 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
|
293 |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
294 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
295 manifest |
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 $ hg manifest |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
298 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
299 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
300 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
301 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
302 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
303 dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
304 dir6/dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
305 dir7-2/c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
306 dir8-2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
307 dir9-2/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
308 e |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
309 large-file |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
310 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
311 contents |
8050
087cc65bebff
convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents:
6873
diff
changeset
|
312 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
313 $ cat dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
314 a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
315 a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
316 $ 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
|
317 [1] |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
318 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
319 file move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
320 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
321 $ hg log -v -C -r 1 | grep copies |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
322 copies: dir/a (a) |
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 check directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
325 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
326 $ hg manifest -r 4 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
327 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
328 dir/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
329 dir/d |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
330 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
331 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
332 e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
333 $ 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
|
334 $ 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
|
335 [1] |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
336 $ hg log -v -C -r 4 | grep copies |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
337 copies: dir1/subdir2/file1 (dir1/subdir1/file1) |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
338 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
339 check file remove with directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
340 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
341 $ hg manifest -r 5 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
342 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
343 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
344 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
345 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
346 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
347 e |
6372
8f79820443a4
Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
348 |
12532
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
349 check file move with directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
350 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
351 $ hg manifest -r 9 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
352 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
353 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
354 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
355 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
356 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
357 dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
358 e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
359 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
360 check file directory directory move |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
361 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
362 $ hg manifest -r 11 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
363 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
364 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
365 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
366 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
367 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
368 dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
369 dir6/dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
370 e |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
371 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
372 check divergent directory moves |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
373 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
374 $ hg manifest -r 13 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
375 bin2 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
376 dir1/subdir2/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
377 dir1/subdir2_other/file1 |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
378 dir2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
379 dir2/newfile |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
380 dir3/d2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
381 dir6/dir4/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
382 dir7-2/c |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
383 dir8-2/a |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
384 dir9-2/b |
742bb15d94a8
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
385 e |
13779
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
386 |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
387 test large file support (> 32kB) |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
388 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22947
diff
changeset
|
389 $ md5sum.py large-file |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
390 5d6de8a95c3b6bf9e0ffb808ba5299c1 large-file |
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
391 |
13779
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
392 check branch closing |
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
393 |
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
394 $ hg branches -a |
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
395 $ hg branches -c |
13792
a916e8de4313
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13779
diff
changeset
|
396 com.selenic.test 14:* (closed) (glob) |
13779
c13bfa451656
convert/mtn: convert suspended branches as closed branches
Daniel Atallah <daniel.atallah@gmail.com>
parents:
13765
diff
changeset
|
397 |