annotate tests/test-convert-filemap.t @ 23344:6333412245ec stable

mq: when setting message in plain mode, separate it from header (issue4453) Fix inconsistent handling of plain header separation in mq patcheader - and contrary to c87f2a5a6e49, do it in the direction of having an empty line between header and description. Plain patches are like mails and should thus have an empty line between headers and body in compliance with RFC 822 3.1.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 16 Nov 2014 19:57:40 +0100
parents fffa9f17c3ef
children aa4a1672583e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 'convert =' >> $HGRCPATH
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
5 $ glog()
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
6 > {
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19863
diff changeset
7 > hg log -G --template '{rev} "{desc}" files: {files}\n' "$@"
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
8 > }
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
9 $ hg init source
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
10 $ cd source
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
11 $ echo foo > foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
12 $ echo baz > baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
13 $ mkdir -p dir/subdir
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
14 $ echo dir/file >> dir/file
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
15 $ 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
16 $ 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
17 $ echo dir/subdir/file3 >> dir/subdir/file3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
18 $ echo dir/subdir/file4 >> dir/subdir/file4
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
19 $ 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
20 $ echo bar > bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
21 $ echo quux > quux
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
22 $ 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
23 $ hg copy foo copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
24 $ 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
25 $ echo >> foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
26 $ hg ci -d '2 0' -m '2: change foo'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
27 $ hg up -qC 1
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
28 $ echo >> bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
29 $ echo >> quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
30 $ 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
31 created new head
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
32 $ hg up -qC 2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
33 $ hg merge -qr 3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
34 $ echo >> bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
35 $ echo >> baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
36 $ 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
37 $ echo >> bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
38 $ echo 1 >> baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
39 $ echo >> quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
40 $ 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
41 $ hg up -qC 4
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
42 $ echo >> foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
43 $ echo 2 >> baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
44 $ 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
45 created new head
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
46 $ hg up -qC 5
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
47 $ hg merge -qr 6
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
48 $ echo >> bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
49 $ 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
50 $ echo >> foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
51 $ hg ci -m '8: change foo'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
52 $ glog
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
53 @ 8 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
54 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
55 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
56 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
57 | o 6 "6: change foo baz" files: baz foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
58 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
59 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
60 |/
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
61 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
62 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
63 | o 3 "3: change bar quux" files: bar quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
64 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
65 o | 2 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
66 |/
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
67 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
68 |
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
69 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
70
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
71
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
72 final file versions in this repo:
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
73
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
74 $ hg manifest --debug
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
75 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
76 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
77 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
78 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
79 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
80 e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c 644 dir/file3
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
81 6edd55f559cdce67132b12ca09e09cee08b60442 644 dir/file4
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
82 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
83 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
84 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
85 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
86 $ hg debugrename copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
87 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
88
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
89 $ cd ..
19862
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
90
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
91
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
92 Test interaction with startrev and verify that changing it is handled properly:
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
93
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
94 $ > empty
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
95 $ hg convert --filemap empty source movingstart --config convert.hg.startrev=3 -r4
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
96 initializing destination movingstart repository
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
97 scanning source...
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
98 sorting...
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
99 converting...
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
100 1 3: change bar quux
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
101 0 4: first merge; change bar baz
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
102 $ hg convert --filemap empty source movingstart
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
103 scanning source...
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
104 sorting...
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
105 converting...
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
106 3 5: change bar baz quux
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
107 2 6: change foo baz
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
108 1 7: second merge; change bar
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
109 warning: af455ce4166b3c9c88e6309c2b9332171dcea595 parent 61e22ca76c3b3e93df20338c4e02ce286898e825 is missing
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
110 warning: cf908b3eeedc301c9272ebae931da966d5b326c7 parent 59e1ab45c888289513b7354484dac8a88217beab is missing
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
111 0 8: change foo
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
112
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
113
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
114 splitrepo tests
42455ebbab9f convert: fix crash when filemap filtering is changed
Mads Kiilerich <madski@unity3d.com>
parents: 17852
diff changeset
115
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
116 $ splitrepo()
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 > msg="$1"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
119 > files="$2"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
120 > opts=$3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
121 > echo "% $files: $msg"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
122 > prefix=`echo "$files" | sed -e 's/ /-/g'`
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
123 > fmap="$prefix.fmap"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
124 > repo="$prefix.repo"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
125 > 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
126 > echo "include $i" >> "$fmap"
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
127 > done
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
128 > hg -q convert $opts --filemap "$fmap" --datesort source "$repo"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
129 > hg up -q -R "$repo"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
130 > glog -R "$repo"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
131 > hg -R "$repo" manifest --debug
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
132 > }
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
133 $ 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
134 % 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
135 @ 3 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
136 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
137 o 2 "6: change foo baz" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
138 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
139 o 1 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
140 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
141 o 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
142
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
143 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
144 $ splitrepo 'merges are not merges anymore' bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
145 % bar: merges are not merges anymore
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
146 @ 4 "7: second merge; change bar" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
147 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
148 o 3 "5: change bar baz quux" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
149 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
150 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
151 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
152 o 1 "3: change bar quux" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
153 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
154 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
155
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
156 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
157 $ 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
158 % 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
159 @ 4 "7: second merge; change bar" files: baz
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 3 "6: change foo baz" files: baz
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 | 2 "5: change bar baz quux" files: baz
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 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
166 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
167 o 0 "0: add foo baz dir/" files: baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
168
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
169 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
170 $ 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
171 % 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
172 @ 8 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
173 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
174 o 7 "7: second merge; change bar" files:
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
175 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
176 | o 6 "6: change foo baz" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
177 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
178 o | 5 "5: change bar baz quux" files: quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
179 |/
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
180 o 4 "4: first merge; change bar baz" files:
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
181 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
182 | o 3 "3: change bar quux" files: quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
183 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
184 o | 2 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
185 |/
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
186 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
187 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
188 o 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
189
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
190 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
191 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
192 $ splitrepo 'partial conversion' 'bar quux' '-r 3'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
193 % bar quux: partial conversion
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
194 @ 1 "3: change bar quux" files: bar quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
195 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
196 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
197
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
198 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
199 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
200 $ splitrepo 'complete the partial conversion' 'bar quux'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
201 % bar quux: complete the partial conversion
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
202 @ 4 "7: second merge; change bar" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
203 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
204 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
205 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
206 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
207 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
208 o 1 "3: change bar quux" files: bar quux
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 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
211
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
212 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
213 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
214 $ rm -r foo.repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
215 $ splitrepo 'partial conversion' 'foo' '-r 3'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
216 % foo: partial conversion
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
217 @ 0 "0: add foo baz dir/" 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 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
220 $ splitrepo 'complete the partial conversion' 'foo'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
221 % foo: complete the partial conversion
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
222 @ 3 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
223 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
224 o 2 "6: change foo baz" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
225 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
226 o 1 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
227 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
228 o 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
229
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
230 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
231 $ 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
232 % copied: copied file; source not included in new repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
233 @ 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
234
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
235 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
236 $ hg --cwd copied.repo debugrename copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
237 copied not renamed
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
238 $ 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
239 % foo copied: copied file; source included in new repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
240 @ 4 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
241 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
242 o 3 "6: change foo baz" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
243 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
244 o 2 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
245 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
246 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
247 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
248 o 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
249
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
250 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
251 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
252 $ hg --cwd foo-copied.repo debugrename copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
253 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
17851
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
254
21054
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
255 verify the top level 'include .' if there is no other includes:
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
256
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
257 $ echo "exclude something" > default.fmap
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
258 $ hg convert -q --filemap default.fmap -r1 source dummydest2
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
259 $ hg -R dummydest2 log --template '{rev} {node|short} {desc|firstline}\n'
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
260 1 61e22ca76c3b 1: add bar quux; copy foo to copied
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
261 0 c085cf2ee7fe 0: add foo baz dir/
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
262
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
263 $ echo "include somethingelse" >> default.fmap
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
264 $ hg convert -q --filemap default.fmap -r1 source dummydest3
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
265 $ hg -R dummydest3 log --template '{rev} {node|short} {desc|firstline}\n'
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
266
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
267 $ echo "include ." >> default.fmap
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
268 $ hg convert -q --filemap default.fmap -r1 source dummydest4
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
269 $ hg -R dummydest4 log --template '{rev} {node|short} {desc|firstline}\n'
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
270 1 61e22ca76c3b 1: add bar quux; copy foo to copied
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
271 0 c085cf2ee7fe 0: add foo baz dir/
fffa9f17c3ef tests: coverage of convert and filemap include and the default of include all
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
272
17851
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
273 ensure that the filemap contains duplicated slashes (issue3612)
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
274
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
275 $ cat > renames.fmap <<EOF
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
276 > include dir
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
277 > exclude dir/file2
17851
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
278 > rename dir dir2//dir3
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
279 > include foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
280 > include copied
17797
e4da793998bf convert: normalize paths in filemaps (issue3612)
Huayang <huayang@fb.com>
parents: 17175
diff changeset
281 > rename foo foo2/
e4da793998bf convert: normalize paths in filemaps (issue3612)
Huayang <huayang@fb.com>
parents: 17175
diff changeset
282 > rename copied ./copied2
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
283 > exclude dir/subdir
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
284 > include dir/subdir/file3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
285 > EOF
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
286 $ 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
287 $ 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
288 $ 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
289 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
290 [255]
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
291 $ 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
292 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
293 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
294 $ hg up -q -R renames.repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
295 $ glog -R renames.repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
296 @ 4 "8: change foo" files: foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
297 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
298 o 3 "6: change foo baz" files: foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
299 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
300 o 2 "2: change foo" files: foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
301 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
302 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
303 |
17852
1f34b57ca319 Merge repeated-slash fix
Bryan O'Sullivan <bryano@fb.com>
parents: 17797 17851
diff changeset
304 o 0 "0: add foo baz dir/" files: dir2/dir3/file dir2/dir3/subdir/file3 foo2
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
305
17851
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
306 $ hg -R renames.repo verify
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
307 checking changesets
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
308 checking manifests
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
309 crosschecking files in changesets and manifests
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
310 checking files
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
311 4 files, 5 changesets, 7 total revisions
7aa7380691b8 verify: tolerate repeated slashes in a converted repo (issue3665)
Bryan O'Sullivan <bryano@fb.com>
parents: 17175
diff changeset
312
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
313 $ hg -R renames.repo manifest --debug
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
314 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2
17852
1f34b57ca319 Merge repeated-slash fix
Bryan O'Sullivan <bryano@fb.com>
parents: 17797 17851
diff changeset
315 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/dir3/file
1f34b57ca319 Merge repeated-slash fix
Bryan O'Sullivan <bryano@fb.com>
parents: 17797 17851
diff changeset
316 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/dir3/subdir/file3
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
317 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
318 $ hg --cwd renames.repo debugrename copied2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
319 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
320
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
321 copied:
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
322
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
323 $ hg --cwd source cat copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
324 foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
325
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
326 copied2:
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
327
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
328 $ hg --cwd renames.repo cat copied2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
329 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
330
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
331 filemap errors
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
332
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
333 $ cat > errors.fmap <<EOF
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
334 > include dir/ # beware that comments changes error line numbers!
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
335 > exclude /dir
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
336 > rename dir//dir /dir//dir/ "out of sync"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
337 > include
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
338 > EOF
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
339 $ hg -q convert --filemap errors.fmap source errors.repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
340 errors.fmap:3: superfluous / in include '/dir'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
341 errors.fmap:3: superfluous / in rename '/dir'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
342 errors.fmap:4: unknown directive 'out of sync'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
343 errors.fmap:5: path to exclude is missing
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
344 abort: errors in filemap
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
345 [255]
13968
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 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
348
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
349 $ hg init branchpruning
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
350 $ cd branchpruning
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
351 $ hg branch foo
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
352 marked working directory as branch foo
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 15243
diff changeset
353 (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
354 $ echo a > a
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
355 $ hg ci -Am adda
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
356 adding a
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
357 $ 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
358 $ hg up 0
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
359 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
360 $ hg branch empty
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
361 marked working directory as branch empty
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 15243
diff changeset
362 (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
363 $ hg ci -m emptybranch
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
364 $ 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
365 $ hg up 0
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
366 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
367 $ hg branch default
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
368 marked working directory as branch default
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 15243
diff changeset
369 (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
370 $ echo b > b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
371 $ hg ci -Am addb
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
372 adding b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
373 $ 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
374 $ cat > filemap <<EOF
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
375 > include b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
376 > EOF
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
377 $ cd ..
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
378 $ hg convert branchpruning branchpruning-hg1
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
379 initializing destination branchpruning-hg1 repository
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
380 scanning source...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
381 sorting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
382 converting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
383 5 adda
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
384 4 closefoo
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
385 3 emptybranch
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
386 2 closeempty
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
387 1 addb
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
388 0 closedefault
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
389 $ glog -R branchpruning-hg1
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
390 o 5 "closedefault" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
391 |
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
392 o 4 "addb" files: b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
393 |
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
394 | o 3 "closeempty" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
395 | |
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
396 | o 2 "emptybranch" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
397 |/
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
398 | o 1 "closefoo" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
399 |/
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
400 o 0 "adda" files: a
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
401
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
402
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
403 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
404
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
405 $ 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
406 initializing destination branchpruning-hg2 repository
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
407 scanning source...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
408 sorting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
409 converting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
410 0 adda
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
411 $ 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
412 scanning source...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
413 sorting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
414 converting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
415 0 addb
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
416 $ 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
417 scanning source...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
418 sorting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
419 converting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
420 3 closefoo
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
421 2 emptybranch
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
422 1 closeempty
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
423 0 closedefault
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
424 $ glog -R branchpruning-hg2
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
425 o 1 "closedefault" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
426 |
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
427 o 0 "addb" files: b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
428
17174
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
429
19863
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
430 Test rebuilding of map with unknown revisions in shamap - it used to crash
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
431
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
432 $ cd branchpruning
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
433 $ hg up -r 2
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
434 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
435 $ hg merge 4
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
436 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
437 (branch merge, don't forget to commit)
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
438 $ hg ci -m 'merging something'
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
439 $ cd ..
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
440 $ echo "53792d18237d2b64971fa571936869156655338d 6d955580116e82c4b029bd30f321323bae71a7f0" >> branchpruning-hg2/.hg/shamap
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
441 $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2 --debug
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
442 run hg source pre-conversion action
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
443 run hg sink pre-conversion action
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
444 scanning source...
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
445 scanning: 1 revisions
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
446 sorting...
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
447 converting...
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
448 0 merging something
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
449 source: 2503605b178fe50e8fbbb0e77b97939540aa8c87
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
450 converting: 0/1 revisions (0.00%)
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
451 unknown revmap source: 53792d18237d2b64971fa571936869156655338d
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
452 run hg sink post-conversion action
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
453 run hg source post-conversion action
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
454
daeab82fa644 convert: fix crash when existing converted revision didn't come from source
Mads Kiilerich <madski@unity3d.com>
parents: 19862
diff changeset
455
17174
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
456 filemap rename undoing revision rename
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
457
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
458 $ hg init renameundo
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
459 $ cd renameundo
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
460 $ echo 1 > a
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
461 $ echo 1 > c
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
462 $ hg ci -qAm add
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
463 $ hg mv -q a b/a
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
464 $ hg mv -q c b/c
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
465 $ hg ci -qm rename
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
466 $ echo 2 > b/a
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
467 $ echo 2 > b/c
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
468 $ hg ci -qm modify
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
469 $ cd ..
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
470
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
471 $ echo "rename b ." > renameundo.fmap
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
472 $ hg convert --filemap renameundo.fmap renameundo renameundo2
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
473 initializing destination renameundo2 repository
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
474 scanning source...
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
475 sorting...
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
476 converting...
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
477 2 add
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
478 1 rename
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
479 filtering out empty revision
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
480 repository tip rolled back to revision 0 (undo commit)
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
481 0 modify
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
482 $ glog -R renameundo2
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
483 o 1 "modify" files: a c
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
484 |
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
485 o 0 "add" files: a c
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
486
32b2e6d641e4 convert: make filemap renames consistently override revision renames
Wagner Bruna <wbruna@yahoo.com>
parents: 15615
diff changeset
487
17175
f76e2196ee70 merge with stable
Matt Mackall <mpm@selenic.com>
parents: 17111 17174
diff changeset
488
17103
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
489 test merge parents/empty merges pruning
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
490
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
491 $ glog()
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
492 > {
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19863
diff changeset
493 > hg log -G --template '{rev}:{node|short}@{branch} "{desc}" files: {files}\n' "$@"
17103
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
494 > }
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
495
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
496 test anonymous branch pruning
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
497
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
498 $ hg init anonymousbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
499 $ cd anonymousbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
500 $ echo a > a
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
501 $ echo b > b
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
502 $ hg ci -Am add
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
503 adding a
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
504 adding b
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
505 $ echo a >> a
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
506 $ hg ci -m changea
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
507 $ hg up 0
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
508 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
509 $ echo b >> b
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
510 $ hg ci -m changeb
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
511 created new head
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
512 $ hg up 1
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
513 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
514 $ hg merge
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
515 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
516 (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
517 $ hg ci -m merge
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
518 $ cd ..
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
519
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
520 $ cat > filemap <<EOF
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
521 > include a
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
522 > EOF
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
523 $ 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
524 initializing destination anonymousbranch-hg repository
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
525 scanning source...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
526 sorting...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
527 converting...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
528 3 add
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
529 2 changea
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
530 1 changeb
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
531 0 merge
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
532 $ glog -R anonymousbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
533 @ 3:c71d5201a498@default "merge" files:
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
534 |\
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
535 | 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
536 | |
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
537 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
538 |/
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
539 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
540
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
541 $ glog -R anonymousbranch-hg
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
542 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
543 |
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
544 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
545
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
546 $ cat anonymousbranch-hg/.hg/shamap
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
547 0146e6129113dba9ac90207cfdf2d7ed35257ae5 c334dc3be0daa2a4e9ce4d2e2bdcba40c09d4916
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
548 1f60ea61782421edf8d051ff4fcb61b330f26a4a cda818e7219b5f7f3fb9f49780054ed6a1905ec3
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
549 607eb44b17f9348cd5cbd26e16af87ba77b0b037 c334dc3be0daa2a4e9ce4d2e2bdcba40c09d4916
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
550 c71d5201a498b2658d105a6bf69d7a0df2649aea cda818e7219b5f7f3fb9f49780054ed6a1905ec3
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
551
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
552 $ cat > filemap <<EOF
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
553 > include b
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
554 > EOF
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
555 $ 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
556 initializing destination anonymousbranch-hg2 repository
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
557 scanning source...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
558 sorting...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
559 converting...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
560 3 add
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
561 2 changea
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
562 1 changeb
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
563 0 merge
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
564 $ glog -R anonymousbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
565 @ 3:c71d5201a498@default "merge" files:
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
566 |\
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
567 | 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
568 | |
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
569 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
570 |/
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
571 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
572
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
573 $ glog -R anonymousbranch-hg2
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
574 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
575 |
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
576 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
577
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
578 $ cat anonymousbranch-hg2/.hg/shamap
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
579 0146e6129113dba9ac90207cfdf2d7ed35257ae5 4b9ced86165703791653059a1db6ed864630a523
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
580 1f60ea61782421edf8d051ff4fcb61b330f26a4a 4b9ced86165703791653059a1db6ed864630a523
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
581 607eb44b17f9348cd5cbd26e16af87ba77b0b037 62dd350b0df695f7d2c82a02e0499b16fd790f22
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
582 c71d5201a498b2658d105a6bf69d7a0df2649aea 62dd350b0df695f7d2c82a02e0499b16fd790f22
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
583
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
584 test named branch pruning
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
585
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
586 $ hg init namedbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
587 $ cd namedbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
588 $ echo a > a
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
589 $ echo b > b
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
590 $ hg ci -Am add
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
591 adding a
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
592 adding b
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
593 $ echo a >> a
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
594 $ hg ci -m changea
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
595 $ hg up 0
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
596 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
597 $ hg branch foo
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
598 marked working directory as branch foo
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
599 (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
600 $ echo b >> b
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
601 $ hg ci -m changeb
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
602 $ hg up default
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
603 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
604 $ hg merge foo
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
605 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
606 (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
607 $ hg ci -m merge
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
608 $ cd ..
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
609
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
610 $ cat > filemap <<EOF
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
611 > include a
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
612 > EOF
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
613 $ 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
614 initializing destination namedbranch-hg repository
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
615 scanning source...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
616 sorting...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
617 converting...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
618 3 add
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
619 2 changea
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
620 1 changeb
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
621 0 merge
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
622 $ glog -R namedbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
623 @ 3:73899bcbe45c@default "merge" files:
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
624 |\
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
625 | 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
626 | |
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
627 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
628 |/
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
629 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
630
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
631 $ glog -R namedbranch-hg
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
632 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
633 |
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
634 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
635
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
636
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
637 $ cd namedbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
638 $ hg --config extensions.mq= strip tip
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
639 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
640 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
641 $ hg up foo
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
642 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
643 $ hg merge default
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
644 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
645 (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
646 $ hg ci -m merge
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
647 $ cd ..
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
648
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
649 $ 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
650 initializing destination namedbranch-hg2 repository
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
651 scanning source...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
652 sorting...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
653 converting...
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
654 3 add
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
655 2 changea
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
656 1 changeb
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
657 0 merge
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
658 $ glog -R namedbranch
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
659 @ 3:e1959de76e1b@foo "merge" files:
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
660 |\
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
661 | 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
662 | |
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
663 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
664 |/
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
665 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
666
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
667 $ glog -R namedbranch-hg2
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
668 o 2:dcf314454667@foo "merge" files:
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
669 |\
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
670 | 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
671 |/
5146de7bce96 convert: keep branch switching merges with ancestors (issue3340)
Patrick Mezard <patrick@mezard.eu>
parents: 15615
diff changeset
672 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
673