Mercurial > hg
annotate tests/test-convert-baz.t @ 28573:6a42564081cb
shelve: adds restoring newly created branch (issue5048) (BC)
Before this patch shelve never preserved branch information,
so after applying unshelve branch was the same as it was
on working copy no matter in which branch shelve took place.
This patch makes bare shelving(with no files specified, without
interactive,include and exclude option) remembers information if
the working directory was on newly created branch ,in other words
working directory was on different branch than its first parent.
In this situation unshelving restores branch information to the working
directory.
author | liscju <piotr.listkiewicz@gmail.com> |
---|---|
date | Wed, 10 Feb 2016 02:23:27 +0100 |
parents | 7a9cbb315d84 |
children | 561a019c0268 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20117
diff
changeset
|
1 #require baz symlink |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
2 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
3 $ baz my-id "mercurial <mercurial@selenic.com>" |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
4 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
5 $ echo "[extensions]" >> $HGRCPATH |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
6 $ echo "convert=" >> $HGRCPATH |
6084
a672df805855
Document and fix tla/baz conversion tests
Patrick Mezard <pmezard@gmail.com>
parents:
6078
diff
changeset
|
7 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
8 create baz archive |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
9 $ baz make-archive baz@mercurial--convert hg-test-convert-baz |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
10 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
11 initialize baz repo |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
12 $ mkdir baz-repo |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
13 $ cd baz-repo/ |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
14 $ baz init-tree baz@mercurial--convert/baz--test--0 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
15 $ baz import |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
16 * creating version baz@mercurial--convert/baz--test--0 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
17 * imported baz@mercurial--convert/baz--test--0 |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
18 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
19 create initial files |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
20 $ echo 'this is a file' > a |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
21 $ baz add a |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
22 $ mkdir src |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
23 $ baz add src |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
24 $ cd src |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
25 $ dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
26 $ baz add b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
27 HACK: hide GNU tar-1.22 "tar: The --preserve option is deprecated, use --preserve-permissions --preserve-order instead" |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
28 $ baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v '^tar' |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
29 * build pristine tree for baz@mercurial--convert/baz--test--0--base-0 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
30 * Scanning for full-tree revision: . |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
31 * from import revision: baz@mercurial--convert/baz--test--0--base-0 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
32 A/ .arch-ids |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
33 A/ src |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
34 A/ src/.arch-ids |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
35 A .arch-ids/a.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
36 A a |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
37 A src/.arch-ids/=id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
38 A src/.arch-ids/b.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
39 A src/b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
40 * update pristine tree (baz@mercurial--convert/baz--test--0--base-0 => baz--test--0--patch-1) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
41 * committed baz@mercurial--convert/baz--test--0--patch-1 |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
42 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
43 create link file and modify a |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
44 $ ln -s ../a a-link |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
45 $ baz add a-link |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
46 $ echo 'this a modification to a' >> ../a |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
47 $ baz commit -s "added link to a and modify a" |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
48 A src/.arch-ids/a-link.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
49 A src/a-link |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
50 M a |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
51 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-1 => baz--test--0--patch-2) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
52 * committed baz@mercurial--convert/baz--test--0--patch-2 |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
53 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
54 create second link and modify b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
55 $ ln -s ../a a-link-2 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
56 $ baz add a-link-2 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
57 $ dd count=1 seek=1 if=/dev/zero of=b > /dev/null 2> /dev/null |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
58 $ baz commit -s "added second link and modify b" |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
59 A src/.arch-ids/a-link-2.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
60 A src/a-link-2 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
61 Mb src/b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
62 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-2 => baz--test--0--patch-3) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
63 * committed baz@mercurial--convert/baz--test--0--patch-3 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
64 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
65 b file to link and a-link-2 to regular file |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
66 $ rm -f a-link-2 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
67 $ echo 'this is now a regular file' > a-link-2 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
68 $ ln -sf ../a b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
69 $ baz commit -s "file to link and link to file test" |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
70 fl src/b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
71 lf src/a-link-2 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
72 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-3 => baz--test--0--patch-4) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
73 * committed baz@mercurial--convert/baz--test--0--patch-4 |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
74 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
75 move a-link-2 file and src directory |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
76 $ cd .. |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
77 $ baz mv src/a-link-2 c |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
78 $ baz mv src test |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
79 $ baz commit -s "move and rename a-link-2 file and src directory" |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
80 D/ src/.arch-ids |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
81 A/ test/.arch-ids |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
82 /> src test |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
83 => src/.arch-ids/a-link-2.id .arch-ids/c.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
84 => src/a-link-2 c |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
85 => src/.arch-ids/=id test/.arch-ids/=id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
86 => src/.arch-ids/a-link.id test/.arch-ids/a-link.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
87 => src/.arch-ids/b.id test/.arch-ids/b.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
88 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-4 => baz--test--0--patch-5) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
89 * committed baz@mercurial--convert/baz--test--0--patch-5 |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
90 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
91 move and add the moved file again |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
92 $ echo e > e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
93 $ baz add e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
94 $ baz commit -s "add e" |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
95 A .arch-ids/e.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
96 A e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
97 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-5 => baz--test--0--patch-6) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
98 * committed baz@mercurial--convert/baz--test--0--patch-6 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
99 $ baz mv e f |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
100 $ echo ee > e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
101 $ baz add e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
102 $ baz commit -s "move e and recreate it again" |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
103 A .arch-ids/e.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
104 A e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
105 => .arch-ids/e.id .arch-ids/f.id |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
106 => e f |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
107 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-6 => baz--test--0--patch-7) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
108 * committed baz@mercurial--convert/baz--test--0--patch-7 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
109 $ cd .. |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
110 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
111 converting baz repo to Mercurial |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
112 $ hg convert baz-repo baz-repo-hg |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
113 initializing destination baz-repo-hg repository |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
114 analyzing tree version baz@mercurial--convert/baz--test--0... |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
115 scanning source... |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
116 sorting... |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
117 converting... |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
118 7 initial import |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
119 6 added a file, src and src/b (binary) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
120 5 added link to a and modify a |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
121 4 added second link and modify b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
122 3 file to link and link to file test |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
123 2 move and rename a-link-2 file and src directory |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
124 1 add e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
125 0 move e and recreate it again |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
126 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
127 $ baz register-archive -d baz@mercurial--convert |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
128 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
129 $ glog() |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
130 > { |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
16972
diff
changeset
|
131 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
132 > } |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
133 |
16673
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
134 show graph log |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
135 $ glog -R baz-repo-hg |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
136 o 7 "move e and recreate it again" files: e f |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
137 | |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
138 o 6 "add e" files: e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
139 | |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
140 o 5 "move and rename a-link-2 file and src directory" files: c src/a-link src/a-link-2 src/b test/a-link test/b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
141 | |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
142 o 4 "file to link and link to file test" files: src/a-link-2 src/b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
143 | |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
144 o 3 "added second link and modify b" files: src/a-link-2 src/b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
145 | |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
146 o 2 "added link to a and modify a" files: a src/a-link |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
147 | |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
148 o 1 "added a file, src and src/b (binary)" files: a src/b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
149 | |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
150 o 0 "initial import" files: |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
151 |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
152 $ hg up -q -R baz-repo-hg |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
153 $ hg -R baz-repo-hg manifest --debug |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
154 c4072c4b72e1cabace081888efa148ee80ca3cbb 644 a |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
155 0201ac32a3a8e86e303dff60366382a54b48a72e 644 c |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
156 1a4a864db0073705a11b1439f563bfa4b46d9246 644 e |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
157 09e0222742fc3f75777fa9d68a5d8af7294cb5e7 644 f |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
158 c0067ba5ff0b7c9a3eb17270839d04614c435623 644 @ test/a-link |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
159 375f4263d86feacdea7e3c27100abd1560f2a973 644 @ test/b |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
160 $ hg -R baz-repo-hg log -r 5 -r 7 -C --debug | grep copies |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
161 copies: c (src/a-link-2) test/a-link (src/a-link) test/b (src/b) |
775a8d33e6f0
tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents:
13765
diff
changeset
|
162 copies: f (e) |