author | Yuya Nishihara <yuya@tcha.org> |
Sat, 18 Mar 2017 19:59:47 +0900 | |
changeset 31517 | 468bc8a1863d |
parent 20117 | aa9385f983fa |
child 34661 | eb586ed5d8ce |
permissions | -rw-r--r-- |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
1 |
this structure seems to tickle a bug in bundle's search for |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
2 |
changesets, so first we have to recreate it |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
3 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
4 |
o 8 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
5 |
| |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
6 |
| o 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
7 |
| | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
8 |
| o 6 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
9 |
|/| |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
10 |
o | 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
11 |
| | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
12 |
o | 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
13 |
| | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
14 |
| o 3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
15 |
| | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
16 |
| o 2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
17 |
|/ |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
18 |
o 1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
19 |
| |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
20 |
o 0 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
21 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
22 |
$ mkrev() |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
23 |
> { |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
24 |
> revno=$1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
25 |
> echo "rev $revno" |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
26 |
> echo "rev $revno" > foo.txt |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
27 |
> hg -q ci -m"rev $revno" |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
28 |
> } |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
29 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
30 |
setup test repo1 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
31 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
32 |
$ hg init repo1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
33 |
$ cd repo1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
34 |
$ echo "rev 0" > foo.txt |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
35 |
$ hg ci -Am"rev 0" |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
36 |
adding foo.txt |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
37 |
$ mkrev 1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
38 |
rev 1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
39 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
40 |
first branch |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
41 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
42 |
$ mkrev 2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
43 |
rev 2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
44 |
$ mkrev 3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
45 |
rev 3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
46 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
47 |
back to rev 1 to create second branch |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
48 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
49 |
$ hg up -r1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
50 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
51 |
$ mkrev 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
52 |
rev 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
53 |
$ mkrev 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
54 |
rev 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
55 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
56 |
merge first branch to second branch |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
57 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
58 |
$ hg up -C -r5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
59 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
60 |
$ HGMERGE=internal:local hg merge |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
61 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
62 |
(branch merge, don't forget to commit) |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
63 |
$ echo "merge rev 5, rev 3" > foo.txt |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
64 |
$ hg ci -m"merge first branch to second branch" |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
65 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
66 |
one more commit following the merge |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
67 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
68 |
$ mkrev 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
69 |
rev 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
70 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
71 |
back to "second branch" to make another head |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
72 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
73 |
$ hg up -r5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
74 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
75 |
$ mkrev 8 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
76 |
rev 8 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
77 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
78 |
the story so far |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
79 |
|
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
16913
diff
changeset
|
80 |
$ hg log -G --template "{rev}\n" |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
81 |
@ 8 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
82 |
| |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
83 |
| o 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
84 |
| | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
85 |
| o 6 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
86 |
|/| |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
87 |
o | 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
88 |
| | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
89 |
o | 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
90 |
| | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
91 |
| o 3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
92 |
| | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
93 |
| o 2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
94 |
|/ |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
95 |
o 1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
96 |
| |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
97 |
o 0 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
98 |
|
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
99 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
100 |
check that "hg outgoing" really does the right thing |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
101 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
102 |
sanity check of outgoing: expect revs 4 5 6 7 8 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
103 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
104 |
$ hg clone -r3 . ../repo2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
105 |
adding changesets |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
106 |
adding manifests |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
107 |
adding file changes |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
108 |
added 4 changesets with 4 changes to 1 files |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
109 |
updating to branch default |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
110 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
111 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
112 |
this should (and does) report 5 outgoing revisions: 4 5 6 7 8 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
113 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
114 |
$ hg outgoing --template "{rev}\n" ../repo2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
115 |
comparing with ../repo2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
116 |
searching for changes |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
117 |
4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
118 |
5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
119 |
6 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
120 |
7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
121 |
8 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
122 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
123 |
test bundle (destination repo): expect 5 revisions |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
124 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
125 |
this should bundle the same 5 revisions that outgoing reported, but it |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
126 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
127 |
actually bundles 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
128 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
129 |
$ hg bundle foo.bundle ../repo2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
130 |
searching for changes |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
131 |
5 changesets found |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
132 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
133 |
test bundle (base revision): expect 5 revisions |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
134 |
|
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
135 |
this should (and does) give exactly the same result as bundle |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
136 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
137 |
with a destination repo... i.e. it's wrong too |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
138 |
|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
139 |
$ hg bundle --base 3 foo.bundle |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
140 |
5 changesets found |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
141 |
|
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
142 |
$ cd .. |