| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
| Thu, 22 Mar 2018 01:20:03 +0100 | |
| branch | mercurial-4.1 |
| changeset 3600 | 6fd84046d4a4 |
| parent 3593 | b92114f201c9 |
| permissions | -rw-r--r-- |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 |
Testing `hg stack` on complex cases when we have multiple successors because of |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 |
divergence, split etc. |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
$ . "$TESTDIR/testlib/topic_setup.sh" |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
Setup |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
$ cat << EOF >> $HGRCPATH |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
> [experimental] |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
> evolution = all |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
> [ui] |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
> interactive = True |
|
3288
b714709afe6a
test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3287
diff
changeset
|
12 |
> [defaults] |
|
b714709afe6a
test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3287
diff
changeset
|
13 |
> split = -d "0 "0 |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
> [extensions] |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
> EOF |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
$ hg init test |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
$ cd test |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
$ echo foo > foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
$ hg add foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
$ hg ci -m "Added foo" |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
$ hg phase -r . --public |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
$ hg topic foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
marked working directory as topic: foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
$ echo a > a |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
$ echo b > b |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 |
$ hg ci -Aqm "Added a and b" |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
$ echo c > c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
$ echo d > d |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
$ hg ci -Aqm "Added c and d" |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
$ echo e > e |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
$ echo f > f |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
$ hg ci -Aqm "Added e and f" |
|
3289
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
35 |
$ hg log -G |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
36 |
@ changeset: 3:f1d3649d6a8b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
37 |
| tag: tip |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
38 |
| topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
39 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
40 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
41 |
| summary: Added e and f |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
42 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
43 |
o changeset: 2:8e8251e8193b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
44 |
| topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
45 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
46 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
47 |
| summary: Added c and d |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
48 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
49 |
o changeset: 1:002b85930b9c |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
50 |
| topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
51 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
52 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
53 |
| summary: Added a and b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
54 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
55 |
o changeset: 0:f3603c09ac10 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
56 |
user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
57 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
58 |
summary: Added foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
59 |
|
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
Testing in case of split within the topic |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
$ hg stack |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
### topic: foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
### target: default (branch) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 |
t3@ Added e and f (current) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
t2: Added c and d |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
t1: Added a and b |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
t0^ Added foo (base) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
$ hg prev |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
[2] Added c and d |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
$ echo 0 > num |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
$ cat > editor.sh << '__EOF__' |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 |
> NUM=$(cat num) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
> NUM=`expr "$NUM" + 1` |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
> echo "$NUM" > num |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
> echo "split$NUM" > "$1" |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
> __EOF__ |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
$ export HGEDITOR="\"sh\" \"editor.sh\"" |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
$ hg split << EOF |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
> y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
> y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
> n |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
> y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 |
> EOF |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
adding c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
91 |
adding d |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
diff --git a/c b/c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
93 |
new file mode 100644 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
examine changes to 'c'? [Ynesfdaq?] y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
@@ -0,0 +1,1 @@ |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
+c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 |
record change 1/2 to 'c'? [Ynesfdaq?] y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
100 |
diff --git a/d b/d |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
new file mode 100644 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 |
examine changes to 'd'? [Ynesfdaq?] n |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 |
Done splitting? [yN] y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
$ hg stack |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
### topic: foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 |
### target: default (branch) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
t4$ Added e and f (unstable) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 |
t3@ split2 (current) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
t2: split1 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
t1: Added a and b |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
t0^ Added foo (base) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 |
|
|
3289
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
115 |
$ hg log -G |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
116 |
@ changeset: 5:5ccee6da565e |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
117 |
| tag: tip |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
118 |
| topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
119 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
120 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
121 |
| summary: split2 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
122 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
123 |
o changeset: 4:f26c1b9addde |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
124 |
| topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
125 |
| parent: 1:002b85930b9c |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
126 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
127 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
128 |
| summary: split1 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
129 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
130 |
| o changeset: 3:f1d3649d6a8b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
131 |
| | topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
132 |
| | user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
133 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
134 |
| | trouble: unstable |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
135 |
| | summary: Added e and f |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
136 |
| | |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
137 |
| x changeset: 2:8e8251e8193b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
138 |
|/ topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
139 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
140 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
141 |
| summary: Added c and d |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
142 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
143 |
o changeset: 1:002b85930b9c |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
144 |
| topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
145 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
146 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
147 |
| summary: Added a and b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
148 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
149 |
o changeset: 0:f3603c09ac10 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
150 |
user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
151 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
152 |
summary: Added foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
153 |
|
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 |
$ hg prev |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 |
[4] split1 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 |
$ echo foo > c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
159 |
$ hg diff |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 |
diff -r f26c1b9addde c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
161 |
--- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
3288
b714709afe6a
test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3287
diff
changeset
|
162 |
+++ b/c * (glob) |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
163 |
@@ -1,1 +1,1 @@ |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 |
-c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
165 |
+foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
166 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
167 |
$ hg amend |
|
3287
4303a46b4167
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3278
diff
changeset
|
168 |
1 new unstable changesets |
|
3289
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
169 |
|
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
170 |
$ hg log -G |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
171 |
@ changeset: 7:7d9445714d83 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
172 |
| tag: tip |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
173 |
| topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
174 |
| parent: 1:002b85930b9c |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
175 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
176 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
177 |
| summary: split1 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
178 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
179 |
| o changeset: 5:5ccee6da565e |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
180 |
| | topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
181 |
| | user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
182 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
183 |
| | trouble: unstable |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
184 |
| | summary: split2 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
185 |
| | |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
186 |
| x changeset: 4:f26c1b9addde |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
187 |
|/ topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
188 |
| parent: 1:002b85930b9c |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
189 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
190 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
191 |
| summary: split1 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
192 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
193 |
| o changeset: 3:f1d3649d6a8b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
194 |
| | topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
195 |
| | user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
196 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
197 |
| | trouble: unstable |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
198 |
| | summary: Added e and f |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
199 |
| | |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
200 |
| x changeset: 2:8e8251e8193b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
201 |
|/ topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
202 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
203 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
204 |
| summary: Added c and d |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
205 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
206 |
o changeset: 1:002b85930b9c |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
207 |
| topic: foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
208 |
| user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
209 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
210 |
| summary: Added a and b |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
211 |
| |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
212 |
o changeset: 0:f3603c09ac10 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
213 |
user: test |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
214 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
215 |
summary: Added foo |
|
bd99cb54712b
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3288
diff
changeset
|
216 |
|
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
217 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
218 |
$ hg stack |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
219 |
### topic: foo (2 heads) |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
220 |
### target: default (branch), 2 behind |
|
3278
e4c0332ecee4
topics: fix `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3277
diff
changeset
|
221 |
t4$ Added e and f (unstable) |
|
e4c0332ecee4
topics: fix `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3277
diff
changeset
|
222 |
t3$ split2 (unstable) |
|
e4c0332ecee4
topics: fix `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3277
diff
changeset
|
223 |
t2@ split1 (current) |
|
e4c0332ecee4
topics: fix `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3277
diff
changeset
|
224 |
t1: Added a and b |
|
e4c0332ecee4
topics: fix `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3277
diff
changeset
|
225 |
t0^ Added foo (base) |