equal
deleted
inserted
replaced
|
1 $ cat >> $HGRCPATH <<EOF |
|
2 > [extensions] |
|
3 > graphlog= |
|
4 > rebase= |
|
5 > |
|
6 > [alias] |
|
7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
|
8 > EOF |
|
9 |
|
10 |
|
11 $ hg init a |
|
12 $ cd a |
|
13 |
|
14 $ echo c1 > c1 |
|
15 $ hg ci -Am c1 |
|
16 adding c1 |
|
17 |
|
18 $ echo c2 > c2 |
|
19 $ hg ci -Am c2 |
|
20 adding c2 |
|
21 |
|
22 $ echo l1 > l1 |
|
23 $ hg ci -Am l1 |
|
24 adding l1 |
|
25 |
|
26 $ hg up -q -C 1 |
|
27 |
|
28 $ echo r1 > r1 |
|
29 $ hg ci -Am r1 |
|
30 adding r1 |
|
31 created new head |
|
32 |
|
33 $ echo r2 > r2 |
|
34 $ hg ci -Am r2 |
|
35 adding r2 |
|
36 |
|
37 $ hg tglog |
|
38 @ 4: 'r2' |
|
39 | |
|
40 o 3: 'r1' |
|
41 | |
|
42 | o 2: 'l1' |
|
43 |/ |
|
44 o 1: 'c2' |
|
45 | |
|
46 o 0: 'c1' |
|
47 |
|
48 Rebase with no arguments - single revision in source branch: |
|
49 |
|
50 $ hg up -q -C 2 |
|
51 |
|
52 $ hg rebase |
|
53 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
|
54 |
|
55 $ hg tglog |
|
56 @ 4: 'l1' |
|
57 | |
|
58 o 3: 'r2' |
|
59 | |
|
60 o 2: 'r1' |
|
61 | |
|
62 o 1: 'c2' |
|
63 | |
|
64 o 0: 'c1' |
|
65 |
|
66 $ cd .. |
|
67 |
|
68 |
|
69 $ hg init b |
|
70 $ cd b |
|
71 |
|
72 $ echo c1 > c1 |
|
73 $ hg ci -Am c1 |
|
74 adding c1 |
|
75 |
|
76 $ echo c2 > c2 |
|
77 $ hg ci -Am c2 |
|
78 adding c2 |
|
79 |
|
80 $ echo l1 > l1 |
|
81 $ hg ci -Am l1 |
|
82 adding l1 |
|
83 |
|
84 $ echo l2 > l2 |
|
85 $ hg ci -Am l2 |
|
86 adding l2 |
|
87 |
|
88 $ hg up -q -C 1 |
|
89 |
|
90 $ echo r1 > r1 |
|
91 $ hg ci -Am r1 |
|
92 adding r1 |
|
93 created new head |
|
94 |
|
95 $ hg tglog |
|
96 @ 4: 'r1' |
|
97 | |
|
98 | o 3: 'l2' |
|
99 | | |
|
100 | o 2: 'l1' |
|
101 |/ |
|
102 o 1: 'c2' |
|
103 | |
|
104 o 0: 'c1' |
|
105 |
|
106 Rebase with no arguments - single revision in target branch: |
|
107 |
|
108 $ hg up -q -C 3 |
|
109 |
|
110 $ hg rebase |
|
111 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
|
112 |
|
113 $ hg tglog |
|
114 @ 4: 'l2' |
|
115 | |
|
116 o 3: 'l1' |
|
117 | |
|
118 o 2: 'r1' |
|
119 | |
|
120 o 1: 'c2' |
|
121 | |
|
122 o 0: 'c1' |
|
123 |