Show More
@@ -1,86 +1,83 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | cat <<EOF >> $HGRCPATH |
|
4 | 4 | [extensions] |
|
5 | 5 | mq= |
|
6 | 6 | [defaults] |
|
7 | 7 | log = --template "{rev}: {desc}\\n" |
|
8 | 8 | heads = --template "{rev}: {desc}\\n" |
|
9 | 9 | incoming = --template "{rev}: {desc}\\n" |
|
10 | 10 | EOF |
|
11 | 11 | |
|
12 | echo "====== .hgrc" | |
|
13 | cat $HGRCPATH | |
|
14 | ||
|
15 | 12 | echo "====== Setup main" |
|
16 | 13 | hg init base |
|
17 | 14 | cd base |
|
18 | 15 | echo "One" > one |
|
19 | 16 | hg add |
|
20 | 17 | hg ci -m "main: one added." |
|
21 | 18 | echo "++" >> one |
|
22 | 19 | hg ci -m "main: one updated." |
|
23 | 20 | |
|
24 | 21 | echo "====== Bundle main" |
|
25 | 22 | hg bundle --base=null ../main.hg |
|
26 | 23 | cd .. |
|
27 | 24 | |
|
28 | 25 | echo "====== Incoming to fresh repo" |
|
29 | 26 | hg init fresh |
|
30 | 27 | echo ">> hg -R fresh incoming main.hg" |
|
31 | 28 | hg -R fresh incoming main.hg |
|
32 | 29 | echo ">> hg -R fresh incoming bundle:fresh+main.hg" |
|
33 | 30 | hg -R fresh incoming bundle:fresh+main.hg |
|
34 | 31 | |
|
35 | 32 | |
|
36 | 33 | echo "====== Setup queue" |
|
37 | 34 | cd base |
|
38 | 35 | hg qinit -c |
|
39 | 36 | hg qnew -m "patch: two added." two.patch |
|
40 | 37 | echo two > two |
|
41 | 38 | hg add |
|
42 | 39 | hg qrefresh |
|
43 | 40 | hg qcommit -m "queue: two.patch added." |
|
44 | 41 | hg qpop -a |
|
45 | 42 | |
|
46 | 43 | echo "====== Bundle queue" |
|
47 | 44 | hg -R .hg/patches bundle --base=null ../queue.hgq |
|
48 | 45 | cd .. |
|
49 | 46 | |
|
50 | 47 | |
|
51 | 48 | echo "====== Clone base" |
|
52 | 49 | hg clone base copy |
|
53 | 50 | cd copy |
|
54 | 51 | hg qinit -c |
|
55 | 52 | |
|
56 | 53 | echo "====== Incoming queue bundle" |
|
57 | 54 | echo ">> hg -R .hg/patches incoming ../queue.hgq" |
|
58 | 55 | hg -R .hg/patches incoming ../queue.hgq |
|
59 | 56 | |
|
60 | 57 | echo "====== Pull queue bundle" |
|
61 | 58 | echo ">> hg -R .hg/patches pull --update ../queue.hgq" |
|
62 | 59 | hg -R .hg/patches pull --update ../queue.hgq |
|
63 | 60 | echo ">> hg -R .hg/patches heads" |
|
64 | 61 | hg -R .hg/patches heads |
|
65 | 62 | echo ">> hg -R .hg/patches log" |
|
66 | 63 | hg -R .hg/patches log |
|
67 | 64 | echo ">> hg qseries" |
|
68 | 65 | hg qseries |
|
69 | 66 | cd .. |
|
70 | 67 | |
|
71 | 68 | |
|
72 | 69 | echo "====== Clone base again" |
|
73 | 70 | hg clone base copy2 |
|
74 | 71 | cd copy2 |
|
75 | 72 | hg qinit -c |
|
76 | 73 | |
|
77 | 74 | echo "====== Unbundle queue bundle" |
|
78 | 75 | echo ">> hg -R .hg/patches unbundle --update ../queue.hgq" |
|
79 | 76 | hg -R .hg/patches unbundle --update ../queue.hgq |
|
80 | 77 | echo ">> hg -R .hg/patches heads" |
|
81 | 78 | hg -R .hg/patches heads |
|
82 | 79 | echo ">> hg -R .hg/patches log" |
|
83 | 80 | hg -R .hg/patches log |
|
84 | 81 | echo ">> hg qseries" |
|
85 | 82 | hg qseries |
|
86 | 83 | cd .. |
@@ -1,70 +1,56 b'' | |||
|
1 | ====== .hgrc | |
|
2 | [ui] | |
|
3 | slash = True | |
|
4 | [defaults] | |
|
5 | backout = -d "0 0" | |
|
6 | commit = -d "0 0" | |
|
7 | debugrawcommit = -d "0 0" | |
|
8 | tag = -d "0 0" | |
|
9 | [extensions] | |
|
10 | mq= | |
|
11 | [defaults] | |
|
12 | log = --template "{rev}: {desc}\n" | |
|
13 | heads = --template "{rev}: {desc}\n" | |
|
14 | incoming = --template "{rev}: {desc}\n" | |
|
15 | 1 | ====== Setup main |
|
16 | 2 | adding one |
|
17 | 3 | ====== Bundle main |
|
18 | 4 | 2 changesets found |
|
19 | 5 | ====== Incoming to fresh repo |
|
20 | 6 | >> hg -R fresh incoming main.hg |
|
21 | 7 | comparing with main.hg |
|
22 | 8 | 0: main: one added. |
|
23 | 9 | 1: main: one updated. |
|
24 | 10 | >> hg -R fresh incoming bundle:fresh+main.hg |
|
25 | 11 | comparing with bundle:fresh+main.hg |
|
26 | 12 | 0: main: one added. |
|
27 | 13 | 1: main: one updated. |
|
28 | 14 | ====== Setup queue |
|
29 | 15 | adding two |
|
30 | 16 | Patch queue now empty |
|
31 | 17 | ====== Bundle queue |
|
32 | 18 | 1 changesets found |
|
33 | 19 | ====== Clone base |
|
34 | 20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35 | 21 | ====== Incoming queue bundle |
|
36 | 22 | >> hg -R .hg/patches incoming ../queue.hgq |
|
37 | 23 | comparing with ../queue.hgq |
|
38 | 24 | 0: queue: two.patch added. |
|
39 | 25 | ====== Pull queue bundle |
|
40 | 26 | >> hg -R .hg/patches pull --update ../queue.hgq |
|
41 | 27 | pulling from ../queue.hgq |
|
42 | 28 | requesting all changes |
|
43 | 29 | adding changesets |
|
44 | 30 | adding manifests |
|
45 | 31 | adding file changes |
|
46 | 32 | added 1 changesets with 3 changes to 3 files |
|
47 | 33 | merging series |
|
48 | 34 | 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
49 | 35 | >> hg -R .hg/patches heads |
|
50 | 36 | 0: queue: two.patch added. |
|
51 | 37 | >> hg -R .hg/patches log |
|
52 | 38 | 0: queue: two.patch added. |
|
53 | 39 | >> hg qseries |
|
54 | 40 | two.patch |
|
55 | 41 | ====== Clone base again |
|
56 | 42 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
57 | 43 | ====== Unbundle queue bundle |
|
58 | 44 | >> hg -R .hg/patches unbundle --update ../queue.hgq |
|
59 | 45 | adding changesets |
|
60 | 46 | adding manifests |
|
61 | 47 | adding file changes |
|
62 | 48 | added 1 changesets with 3 changes to 3 files |
|
63 | 49 | merging series |
|
64 | 50 | 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
65 | 51 | >> hg -R .hg/patches heads |
|
66 | 52 | 0: queue: two.patch added. |
|
67 | 53 | >> hg -R .hg/patches log |
|
68 | 54 | 0: queue: two.patch added. |
|
69 | 55 | >> hg qseries |
|
70 | 56 | two.patch |
General Comments 0
You need to be logged in to leave comments.
Login now