Mercurial > hg
annotate tests/test-convert-filemap.t @ 17156:7034365089bf
localrepo: add "vfs" fields to "localrepository" for migration from "opener"
As a part of migration to vfs, this patch adds "vfs" fields to
"localrepository" class.
This allows new codes to access current "opener" objects related to
repositories via "vfs" fields, so patches referring to "vfs" will
replace referring to "opener" in time.
This patch also adds initializations for "vfs" fields to
"statichttprepository" class derived from it, because its constructor
doesn't invoke the constructor of "localrepository", so "vfs" fields
should be initialized explicitly as same as "opener" fields: it has no
working directory, so "wvfs" field is not added.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Fri, 06 Jul 2012 18:45:26 +0900 |
parents | bddf1220d7a2 |
children | f76e2196ee70 |
rev | line source |
---|---|
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
2 $ HGMERGE=true; export HGMERGE |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
3 $ echo '[extensions]' >> $HGRCPATH |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
4 $ echo 'graphlog =' >> $HGRCPATH |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
5 $ echo 'convert =' >> $HGRCPATH |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
6 $ glog() |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
7 > { |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
8 > hg glog --template '{rev} "{desc}" files: {files}\n' "$@" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
9 > } |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
10 $ hg init source |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
11 $ cd source |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
12 $ echo foo > foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
13 $ echo baz > baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
14 $ mkdir -p dir/subdir |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
15 $ echo dir/file >> dir/file |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
16 $ echo dir/file2 >> dir/file2 |
14151
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
17 $ echo dir/file3 >> dir/file3 # to be corrupted in rev 0 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
18 $ echo dir/subdir/file3 >> dir/subdir/file3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
19 $ echo dir/subdir/file4 >> dir/subdir/file4 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
20 $ hg ci -d '0 0' -qAm '0: add foo baz dir/' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
21 $ echo bar > bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
22 $ echo quux > quux |
14151
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
23 $ echo dir/file4 >> dir/file4 # to be corrupted in rev 1 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
24 $ hg copy foo copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
25 $ hg ci -d '1 0' -qAm '1: add bar quux; copy foo to copied' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
26 $ echo >> foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
27 $ hg ci -d '2 0' -m '2: change foo' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
28 $ hg up -qC 1 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
29 $ echo >> bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
30 $ echo >> quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
31 $ hg ci -d '3 0' -m '3: change bar quux' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
32 created new head |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
33 $ hg up -qC 2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
34 $ hg merge -qr 3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
35 $ echo >> bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
36 $ echo >> baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
37 $ hg ci -d '4 0' -m '4: first merge; change bar baz' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
38 $ echo >> bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
39 $ echo 1 >> baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
40 $ echo >> quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
41 $ hg ci -d '5 0' -m '5: change bar baz quux' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
42 $ hg up -qC 4 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
43 $ echo >> foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
44 $ echo 2 >> baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
45 $ hg ci -d '6 0' -m '6: change foo baz' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
46 created new head |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
47 $ hg up -qC 5 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
48 $ hg merge -qr 6 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
49 $ echo >> bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
50 $ hg ci -d '7 0' -m '7: second merge; change bar' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
51 $ echo >> foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
52 $ hg ci -m '8: change foo' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
53 $ glog |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
54 @ 8 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
55 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
56 o 7 "7: second merge; change bar" files: bar baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
57 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
58 | o 6 "6: change foo baz" files: baz foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
59 | | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
60 o | 5 "5: change bar baz quux" files: bar baz quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
61 |/ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
62 o 4 "4: first merge; change bar baz" files: bar baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
63 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
64 | o 3 "3: change bar quux" files: bar quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
65 | | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
66 o | 2 "2: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
67 |/ |
14151
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
68 o 1 "1: add bar quux; copy foo to copied" files: bar copied dir/file4 quux |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
69 | |
14151
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
70 o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/file3 dir/subdir/file3 dir/subdir/file4 foo |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
71 |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
72 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
73 final file versions in this repo: |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
74 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
75 $ hg manifest --debug |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
76 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
77 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
78 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
79 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
80 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2 |
14151
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
81 e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c 644 dir/file3 |
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
82 6edd55f559cdce67132b12ca09e09cee08b60442 644 dir/file4 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
83 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
84 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
85 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
86 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
87 $ hg debugrename copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
88 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
14151
diff
changeset
|
89 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
90 $ cd .. |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
91 $ splitrepo() |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
92 > { |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
93 > msg="$1" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
94 > files="$2" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
95 > opts=$3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
96 > echo "% $files: $msg" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
97 > prefix=`echo "$files" | sed -e 's/ /-/g'` |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
98 > fmap="$prefix.fmap" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
99 > repo="$prefix.repo" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
100 > for i in $files; do |
12743
4c4aeaab2339
check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents:
12529
diff
changeset
|
101 > echo "include $i" >> "$fmap" |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
102 > done |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
103 > hg -q convert $opts --filemap "$fmap" --datesort source "$repo" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
104 > hg up -q -R "$repo" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
105 > glog -R "$repo" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
106 > hg -R "$repo" manifest --debug |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
107 > } |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
108 $ splitrepo 'skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd' foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
109 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
110 @ 3 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
111 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
112 o 2 "6: change foo baz" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
113 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
114 o 1 "2: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
115 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
116 o 0 "0: add foo baz dir/" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
117 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
118 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
119 $ splitrepo 'merges are not merges anymore' bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
120 % bar: merges are not merges anymore |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
121 @ 4 "7: second merge; change bar" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
122 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
123 o 3 "5: change bar baz quux" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
124 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
125 o 2 "4: first merge; change bar baz" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
126 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
127 o 1 "3: change bar quux" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
128 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
129 o 0 "1: add bar quux; copy foo to copied" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
130 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
131 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
132 $ splitrepo '1st merge is not a merge anymore; 2nd still is' baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
133 % baz: 1st merge is not a merge anymore; 2nd still is |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
134 @ 4 "7: second merge; change bar" files: baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
135 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
136 | o 3 "6: change foo baz" files: baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
137 | | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
138 o | 2 "5: change bar baz quux" files: baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
139 |/ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
140 o 1 "4: first merge; change bar baz" files: baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
141 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
142 o 0 "0: add foo baz dir/" files: baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
143 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
144 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
145 $ splitrepo 'we add additional merges when they are interesting' 'foo quux' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
146 % foo quux: we add additional merges when they are interesting |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
147 @ 8 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
148 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
149 o 7 "7: second merge; change bar" files: |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
150 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
151 | o 6 "6: change foo baz" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
152 | | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
153 o | 5 "5: change bar baz quux" files: quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
154 |/ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
155 o 4 "4: first merge; change bar baz" files: |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
156 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
157 | o 3 "3: change bar quux" files: quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
158 | | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
159 o | 2 "2: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
160 |/ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
161 o 1 "1: add bar quux; copy foo to copied" files: quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
162 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
163 o 0 "0: add foo baz dir/" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
164 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
165 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
166 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
167 $ splitrepo 'partial conversion' 'bar quux' '-r 3' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
168 % bar quux: partial conversion |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
169 @ 1 "3: change bar quux" files: bar quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
170 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
171 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
172 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
173 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
174 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
175 $ splitrepo 'complete the partial conversion' 'bar quux' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
176 % bar quux: complete the partial conversion |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
177 @ 4 "7: second merge; change bar" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
178 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
179 o 3 "5: change bar baz quux" files: bar quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
180 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
181 o 2 "4: first merge; change bar baz" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
182 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
183 o 1 "3: change bar quux" files: bar quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
184 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
185 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
186 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
187 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
188 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
189 $ rm -r foo.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
190 $ splitrepo 'partial conversion' 'foo' '-r 3' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
191 % foo: partial conversion |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
192 @ 0 "0: add foo baz dir/" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
193 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
194 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
195 $ splitrepo 'complete the partial conversion' 'foo' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
196 % foo: complete the partial conversion |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
197 @ 3 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
198 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
199 o 2 "6: change foo baz" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
200 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
201 o 1 "2: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
202 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
203 o 0 "0: add foo baz dir/" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
204 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
205 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
206 $ splitrepo 'copied file; source not included in new repo' copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
207 % copied: copied file; source not included in new repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
208 @ 0 "1: add bar quux; copy foo to copied" files: copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
209 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
210 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
211 $ hg --cwd copied.repo debugrename copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
212 copied not renamed |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
213 $ splitrepo 'copied file; source included in new repo' 'foo copied' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
214 % foo copied: copied file; source included in new repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
215 @ 4 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
216 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
217 o 3 "6: change foo baz" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
218 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
219 o 2 "2: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
220 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
221 o 1 "1: add bar quux; copy foo to copied" files: copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
222 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
223 o 0 "0: add foo baz dir/" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
224 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
225 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
226 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
227 $ hg --cwd foo-copied.repo debugrename copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
228 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
229 $ cat > renames.fmap <<EOF |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
230 > include dir |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
231 > exclude dir/file2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
232 > rename dir dir2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
233 > include foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
234 > include copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
235 > rename foo foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
236 > rename copied copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
237 > exclude dir/subdir |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
238 > include dir/subdir/file3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
239 > EOF |
14151
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
240 $ rm source/.hg/store/data/dir/file3.i |
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
241 $ rm source/.hg/store/data/dir/file4.i |
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
242 $ hg -q convert --filemap renames.fmap --datesort source dummydest |
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
243 abort: data/dir/file3.i@e96dce0bc6a2: no match found! |
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
244 [255] |
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
245 $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo |
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
246 ignoring: data/dir/file3.i@e96dce0bc6a2: no match found |
1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents:
13968
diff
changeset
|
247 ignoring: data/dir/file4.i@6edd55f559cd: no match found |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
248 $ hg up -q -R renames.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
249 $ glog -R renames.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
250 @ 4 "8: change foo" files: foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
251 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
252 o 3 "6: change foo baz" files: foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
253 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
254 o 2 "2: change foo" files: foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
255 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
256 o 1 "1: add bar quux; copy foo to copied" files: copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
257 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
258 o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
259 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
260 $ hg -R renames.repo manifest --debug |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
261 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
262 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
263 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
264 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
265 $ hg --cwd renames.repo debugrename copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
266 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
267 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
268 copied: |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
269 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
270 $ hg --cwd source cat copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
271 foo |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
272 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
273 copied2: |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
274 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
275 $ hg --cwd renames.repo cat copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
276 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
277 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
278 filemap errors |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
279 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
280 $ cat > errors.fmap <<EOF |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
281 > include dir/ # beware that comments changes error line numbers! |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
282 > exclude /dir |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
283 > rename dir//dir /dir//dir/ "out of sync" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
284 > include |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
285 > EOF |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
286 $ hg -q convert --filemap errors.fmap source errors.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
287 errors.fmap:1: superfluous / in exclude 'dir/' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
288 errors.fmap:3: superfluous / in include '/dir' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
289 errors.fmap:3: superfluous / in rename '/dir' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
290 errors.fmap:3: superfluous / in exclude 'dir//dir' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
291 errors.fmap:4: unknown directive 'out of sync' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
292 errors.fmap:5: path to exclude is missing |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
293 abort: errors in filemap |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
294 [255] |
13968
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
295 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
296 test branch closing revision pruning if branch is pruned |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
297 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
298 $ hg init branchpruning |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
299 $ cd branchpruning |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
300 $ hg branch foo |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
301 marked working directory as branch foo |
15615 | 302 (branches are permanent and global, did you want a bookmark?) |
13968
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
303 $ echo a > a |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
304 $ hg ci -Am adda |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
305 adding a |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
306 $ hg ci --close-branch -m closefoo |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
307 $ hg up 0 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
308 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
309 $ hg branch empty |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
310 marked working directory as branch empty |
15615 | 311 (branches are permanent and global, did you want a bookmark?) |
13968
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
312 $ hg ci -m emptybranch |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
313 $ hg ci --close-branch -m closeempty |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
314 $ hg up 0 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
315 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
316 $ hg branch default |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
317 marked working directory as branch default |
15615 | 318 (branches are permanent and global, did you want a bookmark?) |
13968
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
319 $ echo b > b |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
320 $ hg ci -Am addb |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
321 adding b |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
322 $ hg ci --close-branch -m closedefault |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
323 $ cat > filemap <<EOF |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
324 > include b |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
325 > EOF |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
326 $ cd .. |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
327 $ hg convert branchpruning branchpruning-hg1 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
328 initializing destination branchpruning-hg1 repository |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
329 scanning source... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
330 sorting... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
331 converting... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
332 5 adda |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
333 4 closefoo |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
334 3 emptybranch |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
335 2 closeempty |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
336 1 addb |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
337 0 closedefault |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
338 $ glog -R branchpruning-hg1 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
339 o 5 "closedefault" files: |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
340 | |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
341 o 4 "addb" files: b |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
342 | |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
343 | o 3 "closeempty" files: |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
344 | | |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
345 | o 2 "emptybranch" files: |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
346 |/ |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
347 | o 1 "closefoo" files: |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
348 |/ |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
349 o 0 "adda" files: a |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
350 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
351 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
352 exercise incremental conversion at the same time |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
353 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
354 $ hg convert -r0 --filemap branchpruning/filemap branchpruning branchpruning-hg2 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
355 initializing destination branchpruning-hg2 repository |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
356 scanning source... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
357 sorting... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
358 converting... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
359 0 adda |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
360 $ hg convert -r4 --filemap branchpruning/filemap branchpruning branchpruning-hg2 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
361 scanning source... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
362 sorting... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
363 converting... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
364 0 addb |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
365 $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
366 scanning source... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
367 sorting... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
368 converting... |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
369 3 closefoo |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
370 2 emptybranch |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
371 1 closeempty |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
372 0 closedefault |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
373 $ glog -R branchpruning-hg2 |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
374 o 1 "closedefault" files: |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
375 | |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
376 o 0 "addb" files: b |
82845434e974
convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents:
12743
diff
changeset
|
377 |
17103
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
378 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
379 test merge parents/empty merges pruning |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
380 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
381 $ glog() |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
382 > { |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
383 > hg glog --template '{rev}:{node|short}@{branch} "{desc}" files: {files}\n' "$@" |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
384 > } |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
385 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
386 test anonymous branch pruning |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
387 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
388 $ hg init anonymousbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
389 $ cd anonymousbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
390 $ echo a > a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
391 $ echo b > b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
392 $ hg ci -Am add |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
393 adding a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
394 adding b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
395 $ echo a >> a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
396 $ hg ci -m changea |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
397 $ hg up 0 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
398 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
399 $ echo b >> b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
400 $ hg ci -m changeb |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
401 created new head |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
402 $ hg up 1 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
403 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
404 $ hg merge |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
405 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
406 (branch merge, don't forget to commit) |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
407 $ hg ci -m merge |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
408 $ cd .. |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
409 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
410 $ cat > filemap <<EOF |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
411 > include a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
412 > EOF |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
413 $ hg convert --filemap filemap anonymousbranch anonymousbranch-hg |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
414 initializing destination anonymousbranch-hg repository |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
415 scanning source... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
416 sorting... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
417 converting... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
418 3 add |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
419 2 changea |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
420 1 changeb |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
421 0 merge |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
422 $ glog -R anonymousbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
423 @ 3:c71d5201a498@default "merge" files: |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
424 |\ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
425 | o 2:607eb44b17f9@default "changeb" files: b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
426 | | |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
427 o | 1:1f60ea617824@default "changea" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
428 |/ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
429 o 0:0146e6129113@default "add" files: a b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
430 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
431 $ glog -R anonymousbranch-hg |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
432 o 1:cda818e7219b@default "changea" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
433 | |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
434 o 0:c334dc3be0da@default "add" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
435 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
436 $ cat anonymousbranch-hg/.hg/shamap |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
437 0146e6129113dba9ac90207cfdf2d7ed35257ae5 c334dc3be0daa2a4e9ce4d2e2bdcba40c09d4916 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
438 1f60ea61782421edf8d051ff4fcb61b330f26a4a cda818e7219b5f7f3fb9f49780054ed6a1905ec3 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
439 607eb44b17f9348cd5cbd26e16af87ba77b0b037 c334dc3be0daa2a4e9ce4d2e2bdcba40c09d4916 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
440 c71d5201a498b2658d105a6bf69d7a0df2649aea cda818e7219b5f7f3fb9f49780054ed6a1905ec3 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
441 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
442 $ cat > filemap <<EOF |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
443 > include b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
444 > EOF |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
445 $ hg convert --filemap filemap anonymousbranch anonymousbranch-hg2 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
446 initializing destination anonymousbranch-hg2 repository |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
447 scanning source... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
448 sorting... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
449 converting... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
450 3 add |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
451 2 changea |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
452 1 changeb |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
453 0 merge |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
454 $ glog -R anonymousbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
455 @ 3:c71d5201a498@default "merge" files: |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
456 |\ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
457 | o 2:607eb44b17f9@default "changeb" files: b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
458 | | |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
459 o | 1:1f60ea617824@default "changea" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
460 |/ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
461 o 0:0146e6129113@default "add" files: a b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
462 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
463 $ glog -R anonymousbranch-hg2 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
464 o 1:62dd350b0df6@default "changeb" files: b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
465 | |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
466 o 0:4b9ced861657@default "add" files: b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
467 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
468 $ cat anonymousbranch-hg2/.hg/shamap |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
469 0146e6129113dba9ac90207cfdf2d7ed35257ae5 4b9ced86165703791653059a1db6ed864630a523 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
470 1f60ea61782421edf8d051ff4fcb61b330f26a4a 4b9ced86165703791653059a1db6ed864630a523 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
471 607eb44b17f9348cd5cbd26e16af87ba77b0b037 62dd350b0df695f7d2c82a02e0499b16fd790f22 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
472 c71d5201a498b2658d105a6bf69d7a0df2649aea 62dd350b0df695f7d2c82a02e0499b16fd790f22 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
473 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
474 test named branch pruning |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
475 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
476 $ hg init namedbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
477 $ cd namedbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
478 $ echo a > a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
479 $ echo b > b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
480 $ hg ci -Am add |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
481 adding a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
482 adding b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
483 $ echo a >> a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
484 $ hg ci -m changea |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
485 $ hg up 0 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
486 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
487 $ hg branch foo |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
488 marked working directory as branch foo |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
489 (branches are permanent and global, did you want a bookmark?) |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
490 $ echo b >> b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
491 $ hg ci -m changeb |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
492 $ hg up default |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
493 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
494 $ hg merge foo |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
495 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
496 (branch merge, don't forget to commit) |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
497 $ hg ci -m merge |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
498 $ cd .. |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
499 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
500 $ cat > filemap <<EOF |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
501 > include a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
502 > EOF |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
503 $ hg convert --filemap filemap namedbranch namedbranch-hg |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
504 initializing destination namedbranch-hg repository |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
505 scanning source... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
506 sorting... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
507 converting... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
508 3 add |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
509 2 changea |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
510 1 changeb |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
511 0 merge |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
512 $ glog -R namedbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
513 @ 3:73899bcbe45c@default "merge" files: |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
514 |\ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
515 | o 2:8097982d19fc@foo "changeb" files: b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
516 | | |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
517 o | 1:1f60ea617824@default "changea" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
518 |/ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
519 o 0:0146e6129113@default "add" files: a b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
520 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
521 $ glog -R namedbranch-hg |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
522 o 1:cda818e7219b@default "changea" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
523 | |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
524 o 0:c334dc3be0da@default "add" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
525 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
526 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
527 $ cd namedbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
528 $ hg --config extensions.mq= strip tip |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17111
bddf1220d7a2
check-code: verify that 'saved backup bundle to ...' is '(glob)'ed
Mads Kiilerich <mads@kiilerich.com>
parents:
17103
diff
changeset
|
530 saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg (glob) |
17103
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
531 $ hg up foo |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
532 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
533 $ hg merge default |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
534 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
535 (branch merge, don't forget to commit) |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
536 $ hg ci -m merge |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
537 $ cd .. |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
538 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
539 $ hg convert --filemap filemap namedbranch namedbranch-hg2 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
540 initializing destination namedbranch-hg2 repository |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
541 scanning source... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
542 sorting... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
543 converting... |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
544 3 add |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
545 2 changea |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
546 1 changeb |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
547 0 merge |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
548 $ glog -R namedbranch |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
549 @ 3:e1959de76e1b@foo "merge" files: |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
550 |\ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
551 | o 2:8097982d19fc@foo "changeb" files: b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
552 | | |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
553 o | 1:1f60ea617824@default "changea" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
554 |/ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
555 o 0:0146e6129113@default "add" files: a b |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
556 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
557 $ glog -R namedbranch-hg2 |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
558 o 2:dcf314454667@foo "merge" files: |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
559 |\ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
560 | o 1:cda818e7219b@default "changea" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
561 |/ |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
562 o 0:c334dc3be0da@default "add" files: a |
5146de7bce96
convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
563 |