author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Mon, 19 Mar 2018 12:01:07 +0100 | |
changeset 3542 | 7bd516e0a929 |
parent 3530 | 3f056d3a1f70 |
child 3544 | 329056287ef5 |
permissions | -rw-r--r-- |
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 |
** Testing resolution of orphans by `hg evolve` when merges are involved ** |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
$ cat >> $HGRCPATH <<EOF |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
> [ui] |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
> interactive = True |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
> [alias] |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
> glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
> [extensions] |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
> rebase = |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
> EOF |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
Repo Setup |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
$ hg init repo |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
$ cd repo |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ echo ".*\.orig" > .hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
$ hg add .hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
$ hg ci -m "added hgignore" |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
An orphan merge changeset with one of the parent obsoleted |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
========================================================== |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
1) When merging both the parents does not result in conflicts |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
------------------------------------------------------------- |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
$ echo foo > a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 |
$ hg ci -Aqm "added a" |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
$ hg up .^ |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
$ echo foo > b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
$ hg ci -Aqm "added b" |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
$ hg merge |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
(branch merge, don't forget to commit) |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
$ hg ci -m "merging a and b" |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
@ 3:3b2b6f4652ee merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
|\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
| o 2:d76850646258 added b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
o | 1:c7586e2a9264 added a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 |
Testing with obsoleting the second parent |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
$ hg up d76850646258 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 |
$ echo bar > b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 |
$ hg amend |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
1 new orphan changesets |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 |
@ 4:64370c9805e7 added b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 |
| () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 |
| * 3:3b2b6f4652ee merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
| |\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
+---x 2:d76850646258 added b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
| o 1:c7586e2a9264 added a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
$ hg evolve --all |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
move:[3] merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
atop:[4] added b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
working directory is now at 91fd62122a4b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
@ 5:91fd62122a4b merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
|\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 |
| o 4:64370c9805e7 added b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
o | 1:c7586e2a9264 added a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
$ hg parents |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
changeset: 5:91fd62122a4b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
tag: tip |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
parent: 4:64370c9805e7 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
parent: 1:c7586e2a9264 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 |
user: test |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 |
date: Thu Jan 01 00:00:00 1970 +0000 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
summary: merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
91 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
93 |
Testing with obsoleting the first parent |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
$ hg up c7586e2a9264 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
$ echo bar > a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 |
$ hg amend |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
1 new orphan changesets |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
100 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 |
@ 6:3d41537b44ca added a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
| () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 |
| * 5:91fd62122a4b merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
| |\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
+---o 4:64370c9805e7 added b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 |
| x 1:c7586e2a9264 added a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
$ hg evolve --all |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 |
move:[5] merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 |
atop:[6] added a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 |
working directory is now at 968d205ba4d8 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 |
@ 7:968d205ba4d8 merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 |
|\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 |
| o 6:3d41537b44ca added a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
123 |
o | 4:64370c9805e7 added b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
125 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
$ hg parents |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 |
changeset: 7:968d205ba4d8 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
tag: tip |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 |
parent: 6:3d41537b44ca |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 |
parent: 4:64370c9805e7 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 |
user: test |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 |
date: Thu Jan 01 00:00:00 1970 +0000 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
135 |
summary: merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
136 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 |
2) When merging both the parents resulted in conflicts |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
138 |
------------------------------------------------------ |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 |
$ hg up 8fa14d15e168 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
142 |
$ echo foo > c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 |
$ hg ci -Aqm "foo to c" |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 |
$ hg prev |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
146 |
[0] added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
147 |
$ echo bar > c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
148 |
$ hg ci -Aqm "bar to c" |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
149 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
150 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
151 |
@ 9:d0f84b25d4e3 bar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
152 |
| () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
153 |
| o 8:1c165c673853 foo to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 |
| o 7:968d205ba4d8 merging a and b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 |
| |\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 |
+---o 6:3d41537b44ca added a |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
159 |
| o 4:64370c9805e7 added b |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
161 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
162 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
163 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 |
Prune old test changesets to have clear graph view |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
165 |
$ hg prune -r 64370c9805e7 -r 3d41537b44ca -r 968d205ba4d8 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
166 |
3 changesets pruned |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
167 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
168 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
169 |
@ 9:d0f84b25d4e3 bar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
170 |
| () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
171 |
| o 8:1c165c673853 foo to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
172 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
173 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
174 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
175 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
176 |
$ hg merge |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
177 |
merging c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
178 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
179 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
180 |
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
181 |
[1] |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
182 |
$ echo foobar > c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
183 |
$ hg resolve -m |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
184 |
(no more unresolved files) |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
185 |
$ hg ci -m "foobar to c" |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
186 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
187 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
188 |
@ 10:fd41d25a3e90 foobar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
189 |
|\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
190 |
| o 9:d0f84b25d4e3 bar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
191 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
192 |
o | 8:1c165c673853 foo to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
193 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
194 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
195 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
196 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
197 |
Testing with first parent obsoleted |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
198 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
199 |
$ hg up 1c165c673853 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
200 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
201 |
$ echo FOO > c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
202 |
$ hg amend |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
203 |
1 new orphan changesets |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
204 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
205 |
$ hg glog |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
206 |
@ 11:31c317b7bdb1 foo to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
207 |
| () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
208 |
| * 10:fd41d25a3e90 foobar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
209 |
| |\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
210 |
+---o 9:d0f84b25d4e3 bar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
211 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
212 |
| x 8:1c165c673853 foo to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
213 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
214 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
215 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
216 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
217 |
$ hg evolve --all |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
218 |
move:[10] foobar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
219 |
atop:[11] foo to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
220 |
merging c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
221 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
222 |
evolve failed! |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
223 |
fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
224 |
abort: unresolved merge conflicts (see hg help resolve) |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
225 |
[255] |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
226 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
227 |
$ echo FOObar > c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
228 |
$ hg resolve -m |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
229 |
(no more unresolved files) |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
230 |
continue: hg evolve --continue |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
231 |
$ hg evolve --continue |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
232 |
evolving 10:fd41d25a3e90 "foobar to c" |
3529
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
233 |
working directory is now at c5405d2da7a1 |
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
234 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
235 |
$ hg glog |
3529
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
236 |
@ 12:c5405d2da7a1 foobar to c |
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
237 |
|\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
238 |
| o 11:31c317b7bdb1 foo to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
239 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
240 |
o | 9:d0f84b25d4e3 bar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
241 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
242 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
243 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
244 |
|
3529
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
245 |
$ hg parents |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
246 |
changeset: 12:c5405d2da7a1 |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
247 |
tag: tip |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
248 |
parent: 11:31c317b7bdb1 |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
249 |
parent: 9:d0f84b25d4e3 |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
250 |
user: test |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
251 |
date: Thu Jan 01 00:00:00 1970 +0000 |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
252 |
summary: foobar to c |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
253 |
|
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
254 |
Testing a conlficting merge with second parent obsoleted |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
255 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
256 |
$ hg up 31c317b7bdb1 |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
257 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
258 |
$ echo foo > c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
259 |
$ hg amend |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
260 |
1 new orphan changesets |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
261 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
262 |
$ hg glog |
3529
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
263 |
@ 13:928097d0b5b5 foo to c |
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
264 |
| () draft |
3529
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
265 |
| * 12:c5405d2da7a1 foobar to c |
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
266 |
| |\ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
267 |
+---x 11:31c317b7bdb1 foo to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
268 |
| | () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
269 |
| o 9:d0f84b25d4e3 bar to c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
270 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
271 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
272 |
() draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
273 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
274 |
$ hg evolve --all |
3529
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
275 |
move:[12] foobar to c |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
276 |
atop:[13] foo to c |
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
277 |
merging c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
278 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
279 |
evolve failed! |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
280 |
fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
281 |
abort: unresolved merge conflicts (see hg help resolve) |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
282 |
[255] |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
283 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
284 |
$ echo foobar > c |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
285 |
$ hg resolve -m |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
286 |
(no more unresolved files) |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
287 |
continue: hg evolve --continue |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
288 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
289 |
$ hg evolve --continue |
3529
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
290 |
evolving 12:c5405d2da7a1 "foobar to c" |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
291 |
working directory is now at dc1948a6eeab |
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
292 |
|
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
293 |
$ hg glog |
3529
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
294 |
@ 14:dc1948a6eeab foobar to c |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
295 |
|\ () draft |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
296 |
| o 13:928097d0b5b5 foo to c |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
297 |
| | () draft |
d90e0faaec80
evolve: fix stabilization of orphan merge changesets in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3528
diff
changeset
|
298 |
o | 9:d0f84b25d4e3 bar to c |
3528
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
299 |
|/ () draft |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
300 |
o 0:8fa14d15e168 added hgignore |
92f1e2408fd0
tests: add a test file of resolving orphaness of merge changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
301 |
() draft |
3530
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
302 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
303 |
3) When stabilizing other changesets resulted in orphan merge changeset |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
304 |
----------------------------------------------------------------------- |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
305 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
306 |
$ hg prune -r d0f84b25d4e3 -r 928097d0b5b5 -r dc1948a6eeab |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
307 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
308 |
working directory now at 8fa14d15e168 |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
309 |
3 changesets pruned |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
310 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
311 |
$ for ch in l m; do echo foo > $ch; hg ci -Aqm "added "$ch; done; |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
312 |
$ hg up 8fa14d15e168 |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
313 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
314 |
$ for ch in x y; do echo foo > $ch; hg ci -Aqm "added "$ch; done; |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
315 |
$ hg glog |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
316 |
@ 18:863d11043c67 added y |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
317 |
| () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
318 |
o 17:3f2247835c1d added x |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
319 |
| () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
320 |
| o 16:e44dc179e7f5 added m |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
321 |
| | () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
322 |
| o 15:8634bee7bf1e added l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
323 |
|/ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
324 |
o 0:8fa14d15e168 added hgignore |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
325 |
() draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
326 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
327 |
$ hg merge |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
328 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
329 |
(branch merge, don't forget to commit) |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
330 |
$ hg ci -m "merge commit" |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
331 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
332 |
$ hg up 8634bee7bf1e |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
333 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
334 |
$ echo bar > l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
335 |
$ hg amend |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
336 |
2 new orphan changesets |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
337 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
338 |
$ hg glog |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
339 |
@ 20:fccc9de66799 added l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
340 |
| () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
341 |
| * 19:190763373d8b merge commit |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
342 |
| |\ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
343 |
| | o 18:863d11043c67 added y |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
344 |
| | | () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
345 |
+---o 17:3f2247835c1d added x |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
346 |
| | () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
347 |
| * 16:e44dc179e7f5 added m |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
348 |
| | () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
349 |
| x 15:8634bee7bf1e added l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
350 |
|/ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
351 |
o 0:8fa14d15e168 added hgignore |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
352 |
() draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
353 |
$ hg evolve --all |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
354 |
move:[16] added m |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
355 |
atop:[20] added l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
356 |
move:[19] merge commit |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
357 |
atop:[21] added m |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
358 |
working directory is now at a446ad3e6700 |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
359 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
360 |
$ hg glog |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
361 |
@ 22:a446ad3e6700 merge commit |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
362 |
|\ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
363 |
| o 21:495d2039f8f1 added m |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
364 |
| | () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
365 |
| o 20:fccc9de66799 added l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
366 |
| | () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
367 |
o | 18:863d11043c67 added y |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
368 |
| | () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
369 |
o | 17:3f2247835c1d added x |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
370 |
|/ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
371 |
o 0:8fa14d15e168 added hgignore |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
372 |
() draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
373 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
374 |
4) When both the parents of the merge changeset are obsolete with a succ |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
375 |
------------------------------------------------------------------------ |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
376 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
377 |
$ hg prune -r a446ad3e6700 -r 495d2039f8f1 -r 863d11043c67 |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
378 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
379 |
working directory now at fccc9de66799 |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
380 |
3 changesets pruned |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
381 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
382 |
$ hg glog |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
383 |
@ 20:fccc9de66799 added l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
384 |
| () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
385 |
| o 17:3f2247835c1d added x |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
386 |
|/ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
387 |
o 0:8fa14d15e168 added hgignore |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
388 |
() draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
389 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
390 |
$ hg merge |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
391 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
392 |
(branch merge, don't forget to commit) |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
393 |
$ hg ci -m "merged l and x" |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
394 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
395 |
$ hg up fccc9de66799 |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
396 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
397 |
$ echo foobar > l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
398 |
$ hg amend |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
399 |
1 new orphan changesets |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
400 |
$ hg up 3f2247835c1d |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
401 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
402 |
$ echo bar > x |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
403 |
$ hg amend |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
404 |
$ hg glog |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
405 |
@ 25:cdf6547da25f added x |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
406 |
| () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
407 |
| o 24:3f371171d767 added l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
408 |
|/ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
409 |
| * 23:7b78a9784f3e merged l and x |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
410 |
| |\ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
411 |
+---x 20:fccc9de66799 added l |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
412 |
| | () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
413 |
| x 17:3f2247835c1d added x |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
414 |
|/ () draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
415 |
o 0:8fa14d15e168 added hgignore |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
416 |
() draft |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
417 |
|
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
418 |
XXX: We should handle this case too |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
419 |
$ hg evolve --all |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
420 |
warning: no support for evolving merge changesets with two obsolete parents yet |
3f056d3a1f70
tests: add more tests related to stabilization of orphaned merge commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3529
diff
changeset
|
421 |
(Redo the merge (7b78a9784f3e) and use `hg prune <old> --succ <new>` to obsolete the old one) |