| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
| Thu, 13 Sep 2018 19:22:03 +0200 | |
| branch | stable |
| changeset 4104 | a023abd12f3b |
| parent 4067 | fb4801478d5d |
| child 4076 | f9a850018daa |
| child 4161 | 3c28f8a3a5a5 |
| 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 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
> [extensions] |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
> show = |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
> EOF |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
$ 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
|
16 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ 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
|
18 |
$ cd test |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
$ 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
|
20 |
$ 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
|
21 |
$ 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
|
22 |
$ 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
|
23 |
$ 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
|
24 |
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
|
25 |
$ 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
|
26 |
$ 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
|
27 |
$ 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
|
28 |
$ 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
|
29 |
$ 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
|
30 |
$ 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
|
31 |
$ 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
|
32 |
$ 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
|
33 |
$ hg ci -Aqm "Added e and 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 show work |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
@ f1d3 (foo) Added e and f |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
o 8e82 (foo) 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
|
37 |
o 002b (foo) 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
|
38 |
o f360 Added foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
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
|
41 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
$ hg stack |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
### topic: foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
### target: default (branch) |
|
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
45 |
s3@ Added e and f (current) |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
46 |
s2: Added c and d |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
47 |
s1: Added a and b |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
48 |
s0^ Added foo (base) |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
$ hg prev |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
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
|
51 |
[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
|
52 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 |
$ 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
|
54 |
$ 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
|
55 |
> 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
|
56 |
> 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
|
57 |
> 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
|
58 |
> 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
|
59 |
> __EOF__ |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
$ 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
|
61 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
$ 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
|
63 |
> y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
> y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
> n |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 |
> y |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
> EOF |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
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
|
69 |
adding c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
adding d |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
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
|
72 |
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
|
73 |
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
|
74 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
@@ -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
|
76 |
+c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
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
|
78 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
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
|
80 |
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
|
81 |
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
|
82 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
Done splitting? [yN] y |
|
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
84 |
1 new orphan changesets |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
$ hg stack |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
### topic: foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 |
### target: default (branch) |
|
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
89 |
s4$ Added e and f (unstable) |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
90 |
s3@ split2 (current) |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
91 |
s2: split1 |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
92 |
s1: Added a and b |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
93 |
s0^ Added foo (base) |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
$ hg show work |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
@ 5cce (foo) split2 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
o f26c (foo) split1 |
|
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
98 |
| * f1d3 (foo) Added e and f |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
| x 8e82 (foo) 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
|
100 |
|/ |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
o 002b (foo) 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
|
102 |
o f360 Added foo |
|
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 |
$ hg prev |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
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
|
106 |
[4] split1 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
$ 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
|
108 |
$ hg diff |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
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
|
110 |
--- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
+++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
@@ -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
|
113 |
-c |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 |
+foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 |
$ hg amend |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 |
1 new orphan changesets |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 |
$ hg show work |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 |
@ 7d94 (foo) split1 |
|
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
120 |
| * 5cce (foo) split2 |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 |
| x f26c (foo) split1 |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
|/ |
|
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
123 |
| * f1d3 (foo) Added e and f |
|
3277
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 |
| x 8e82 (foo) 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
|
125 |
|/ |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 |
o 002b (foo) 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
|
127 |
o f360 Added foo |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
|
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 |
$ hg stack |
|
0a6954bd6502
tests: add a test showing traceback on `hg stack` in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
### 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
|
131 |
### target: default (branch), 2 behind |
|
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
132 |
s4$ Added e and f (unstable) |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
133 |
s3$ split2 (unstable) |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
134 |
s2@ split1 (current) |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
135 |
s1: Added a and b |
|
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
136 |
s0^ Added foo (base) |