| author | Pulkit Goyal <7895pulkit@gmail.com> |
| Thu, 07 Jun 2018 18:18:30 +0530 | |
| changeset 3881 | 9cf45b94f977 |
| parent 3657 | b36e38e3a176 |
| child 3714 | 19ec729f3ca2 |
| child 3898 | 93d9cde93b82 |
| permissions | -rw-r--r-- |
|
3655
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 |
Test for issue 5832 present at https://bz.mercurial-scm.org/show_bug.cgi?id=5832 |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 |
================================================================================ |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
Setup |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
===== |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
$ cat >> $HGRCPATH <<EOF |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
> [phases] |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
> publish = False |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
> [alias] |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
> glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
> [extensions] |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
> EOF |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
$ hg init issue5832 |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ cd issue5832 |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
$ echo base > base |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
$ hg ci -Aqm "added base" |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
$ echo a > a |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
$ hg ci -Aqm "added a" |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
$ echo b > b |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
$ hg ci -Aqm "added b" |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 |
$ hg up .^^ |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
$ echo c > c |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
$ echo d > d |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
$ hg ci -Aqm "added c and d" |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
$ hg merge |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
(branch merge, don't forget to commit) |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 |
$ hg ci -m "merge commit" |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
$ hg glog |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
@ 4:b9b387427a53 merge commit |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
|\ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
| o 3:9402371b436e added c and d |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
| | () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
o | 2:a1da0651488c added b |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
| | () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
o | 1:1b24879c5c3c added a |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 |
|/ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 |
o 0:bde1d2b6b5e5 added base |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
() draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
$ hg up 1b24879c5c3c |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 |
$ echo foo > a |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
$ hg amend |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 |
2 new orphan changesets |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 |
$ hg up bde1d2b6b5e5 |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 |
$ echo c > c |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
$ hg ci -Aqm "added c" |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
$ hg up .^ |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
$ echo d > d |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
$ hg ci -Aqm "added d" |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
$ hg glog |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 |
@ 7:5841d7cf9893 added d |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
| () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
| o 6:62fb70414f99 added c |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
|/ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
| o 5:7014ec2829cd added a |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
|/ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
| * 4:b9b387427a53 merge commit |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 |
| |\ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
+---o 3:9402371b436e added c and d |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
| | () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 |
| * 2:a1da0651488c added b |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
| | () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
| x 1:1b24879c5c3c added a |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
|/ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
o 0:bde1d2b6b5e5 added base |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
() draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
$ hg prune -r 9402371b436e --succ 62fb70414f99 --succ 5841d7cf9893 --split |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
1 changesets pruned |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
$ hg glog |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
@ 7:5841d7cf9893 added d |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 |
| () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 |
| o 6:62fb70414f99 added c |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
|/ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
91 |
| o 5:7014ec2829cd added a |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
|/ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
93 |
| * 4:b9b387427a53 merge commit |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
| |\ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
+---x 3:9402371b436e added c and d |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
| | () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
| * 2:a1da0651488c added b |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 |
| | () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
| x 1:1b24879c5c3c added a |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
100 |
|/ () draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
o 0:bde1d2b6b5e5 added base |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 |
() draft |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 |
Checking what evolve is trying to do |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
$ hg evolve --dry-run --any --all |
|
3656
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
107 |
move:[2] added b |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
108 |
atop:[5] added a |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
109 |
hg rebase -r a1da0651488c -d 7014ec2829cd |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
110 |
could not solve instability, ambiguous destination: parent split across two branches |
|
3655
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
|
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
Resolving instability using `hg evolve` |
|
19e3771f4bcc
tests: add a test demonstarting issue5832 traceback
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
|
|
3656
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
114 |
$ hg evolve --any --all --config ui.interactive=True <<EOF |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
115 |
> 0 |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
116 |
> EOF |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
117 |
move:[2] added b |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
118 |
atop:[5] added a |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
119 |
move:[4] merge commit |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
120 |
atop:[8] added b |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
121 |
ancestor '7235ef625ea3' split over multiple topological branches. |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
122 |
choose an evolve destination: |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
123 |
0: [62fb70414f99] added c |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
124 |
1: [5841d7cf9893] added d |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
125 |
q: quit the prompt |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
126 |
enter the index of the revision you want to select: 0 |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
127 |
move:[9] merge commit |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
128 |
atop:[6] added c |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
129 |
working directory is now at 28a0775ac832 |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
130 |
|
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
131 |
$ hg glog |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
132 |
@ 10:28a0775ac832 merge commit |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
133 |
|\ () draft |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
134 |
| o 8:2baf8bae7ea4 added b |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
135 |
| | () draft |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
136 |
| | o 7:5841d7cf9893 added d |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
137 |
| | | () draft |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
138 |
o---+ 6:62fb70414f99 added c |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
139 |
/ / () draft |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
140 |
o / 5:7014ec2829cd added a |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
141 |
|/ () draft |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
142 |
o 0:bde1d2b6b5e5 added base |
|
62e4149435d8
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3655
diff
changeset
|
143 |
() draft |
|
3657
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
144 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
145 |
$ cd .. |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
146 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
147 |
Test for issue5833 present at https://bz.mercurial-scm.org/show_bug.cgi?id=5833 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
148 |
=============================================================================== |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
149 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
150 |
$ hg init issue5833 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
151 |
$ cd issue5833 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
152 |
$ echo base > base |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
153 |
$ hg ci -Aqm "added base" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
154 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
155 |
$ echo a > a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
156 |
$ hg ci -Aqm "added a" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
157 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
158 |
$ echo b > b |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
159 |
$ hg ci -Aqm "added b" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
160 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
161 |
$ hg up .^^ |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
162 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
163 |
$ echo c > c |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
164 |
$ echo d > d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
165 |
$ hg ci -Aqm "added c and d" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
166 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
167 |
$ hg merge |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
168 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
169 |
(branch merge, don't forget to commit) |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
170 |
$ hg ci -m "merge commit" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
171 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
172 |
$ hg glog |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
173 |
@ 4:b9b387427a53 merge commit |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
174 |
|\ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
175 |
| o 3:9402371b436e added c and d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
176 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
177 |
o | 2:a1da0651488c added b |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
178 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
179 |
o | 1:1b24879c5c3c added a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
180 |
|/ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
181 |
o 0:bde1d2b6b5e5 added base |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
182 |
() draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
183 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
184 |
$ hg up bde1d2b6b5e5 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
185 |
0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
186 |
$ echo l > l |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
187 |
$ hg ci -Aqm "added l" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
188 |
$ hg grab -r 1b24879c5c3c |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
189 |
grabbing 1:1b24879c5c3c "added a" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
190 |
2 new orphan changesets |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
191 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
192 |
$ hg up bde1d2b6b5e5 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
193 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
194 |
$ echo c > c |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
195 |
$ hg ci -Aqm "added c" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
196 |
$ hg up .^ |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
197 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
198 |
$ echo d > d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
199 |
$ hg ci -Aqm "added d" |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
200 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
201 |
$ hg glog |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
202 |
@ 8:5841d7cf9893 added d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
203 |
| () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
204 |
| o 7:62fb70414f99 added c |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
205 |
|/ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
206 |
| o 6:5568b87b1491 added a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
207 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
208 |
| o 5:0a6281e212fe added l |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
209 |
|/ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
210 |
| * 4:b9b387427a53 merge commit |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
211 |
| |\ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
212 |
+---o 3:9402371b436e added c and d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
213 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
214 |
| * 2:a1da0651488c added b |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
215 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
216 |
| x 1:1b24879c5c3c added a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
217 |
|/ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
218 |
o 0:bde1d2b6b5e5 added base |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
219 |
() draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
220 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
221 |
$ hg prune -r 9402371b436e --succ 5841d7cf9893 --succ 62fb70414f99 --split |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
222 |
1 changesets pruned |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
223 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
224 |
$ hg glog |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
225 |
@ 8:5841d7cf9893 added d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
226 |
| () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
227 |
| o 7:62fb70414f99 added c |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
228 |
|/ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
229 |
| o 6:5568b87b1491 added a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
230 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
231 |
| o 5:0a6281e212fe added l |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
232 |
|/ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
233 |
| * 4:b9b387427a53 merge commit |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
234 |
| |\ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
235 |
+---x 3:9402371b436e added c and d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
236 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
237 |
| * 2:a1da0651488c added b |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
238 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
239 |
| x 1:1b24879c5c3c added a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
240 |
|/ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
241 |
o 0:bde1d2b6b5e5 added base |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
242 |
() draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
243 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
244 |
$ hg evolve --any --all --dry-run |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
245 |
move:[2] added b |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
246 |
atop:[6] added a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
247 |
hg rebase -r a1da0651488c -d 5568b87b1491 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
248 |
could not solve instability, ambiguous destination: parent split across two branches |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
249 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
250 |
$ hg evolve --any --all --config ui.interactive=True <<EOF |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
251 |
> 1 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
252 |
> EOF |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
253 |
move:[2] added b |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
254 |
atop:[6] added a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
255 |
move:[4] merge commit |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
256 |
atop:[9] added b |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
257 |
ancestor 'cdf2ea1b9312' split over multiple topological branches. |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
258 |
choose an evolve destination: |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
259 |
0: [62fb70414f99] added c |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
260 |
1: [5841d7cf9893] added d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
261 |
q: quit the prompt |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
262 |
enter the index of the revision you want to select: 1 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
263 |
move:[10] merge commit |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
264 |
atop:[8] added d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
265 |
working directory is now at 460e6e72b7f9 |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
266 |
|
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
267 |
$ hg glog |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
268 |
@ 11:460e6e72b7f9 merge commit |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
269 |
|\ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
270 |
| o 9:da76bb7cd904 added b |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
271 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
272 |
o | 8:5841d7cf9893 added d |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
273 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
274 |
+---o 7:62fb70414f99 added c |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
275 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
276 |
| o 6:5568b87b1491 added a |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
277 |
| | () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
278 |
| o 5:0a6281e212fe added l |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
279 |
|/ () draft |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
280 |
o 0:bde1d2b6b5e5 added base |
|
b36e38e3a176
tests: add test demonstarting issue5833 is fixed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3656
diff
changeset
|
281 |
() draft |