author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Thu, 25 Oct 2018 18:50:42 +0200 | |
branch | stable |
changeset 4218 | da5f7927917c |
parent 4122 | 4eb3877540f1 |
child 4173 | e268f7fd7839 |
child 4288 | 00bc03f56f37 |
permissions | -rw-r--r-- |
3750
85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
1 |
Tests for the --abort flag for `hg evolve` command while orphan resolution |
85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
2 |
========================================================================== |
85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
3 |
|
85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
4 |
The `--abort` flag aborts the interrupted evolve by undoing all the work which |
85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
5 |
was done during resolution i.e. stripping new changesets created, moving |
85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
6 |
bookmarks back, moving working directory back. |
85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
7 |
|
85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
8 |
This test contains cases when `hg evolve` is doing orphan resolution. |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
Setup |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
===== |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
$ cat >> $HGRCPATH <<EOF |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
> [phases] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
> publish = False |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
> [alias] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
> glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
> [extensions] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
> EOF |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
$ hg init abortrepo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
$ cd abortrepo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
$ echo ".*\.orig" > .hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
$ hg add .hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
$ hg ci -m "added hgignore" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
@ 4:c41c793e0ef1 added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
o 3:ca1b80f7960a added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
o 2:b1661037fa25 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
o 1:c7586e2a9264 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
Testing --abort when no evolve is interrupted |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
============================================= |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
$ hg evolve --abort |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
abort: no interrupted evolve to stop |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
[255] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 |
Testing with wrong combination of flags |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
======================================= |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
$ hg evolve --abort --continue |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 |
abort: cannot specify both "--abort" and "--continue" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 |
[255] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 |
$ hg evolve --abort --stop |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
abort: cannot specify both "--abort" and "--stop" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 |
[255] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 |
$ hg evolve --abort --rev 3 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
abort: cannot specify both "--rev" and "--abort" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
[255] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
$ hg evolve --abort --any |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
abort: cannot specify both "--any" and "--abort" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
[255] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
$ hg evolve --abort --all |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
abort: cannot specify both "--all" and "--abort" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
[255] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
Normal testingw when no rev was evolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
======================================== |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
$ hg prev |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 |
[3] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
$ echo babar > d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
$ hg add d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
$ hg amend |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
1 new orphan changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
$ hg evolve --all |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
move:[4] added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
atop:[5] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
merging d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
88 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
89 |
[1] |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
|
3976
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
91 |
$ hg parents |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
92 |
changeset: 5:e93a9161a274 |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
93 |
tag: tip |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
94 |
parent: 2:b1661037fa25 |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
95 |
user: test |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
96 |
date: Thu Jan 01 00:00:00 1970 +0000 |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
97 |
summary: added c |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
98 |
|
3978
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
99 |
changeset: 4:c41c793e0ef1 |
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
100 |
user: test |
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
101 |
date: Thu Jan 01 00:00:00 1970 +0000 |
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
102 |
instability: orphan |
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
103 |
summary: added d |
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
104 |
|
3976
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3852
diff
changeset
|
105 |
|
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
$ hg evolve --abort |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
evolve aborted |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 |
working directory is now at e93a9161a274 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
@ 5:e93a9161a274 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
| * 4:c41c793e0ef1 added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 |
| x 3:ca1b80f7960a added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 |
o 2:b1661037fa25 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 |
o 1:c7586e2a9264 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
123 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 |
$ hg diff |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
125 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 |
$ hg status |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
cleaning up things for next testing |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
$ hg evolve --all |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 |
move:[4] added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 |
atop:[5] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 |
merging d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 |
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
135 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
136 |
[1] |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 |
$ echo foo > d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
138 |
$ hg resolve -m |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 |
(no more unresolved files) |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 |
continue: hg evolve --continue |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 |
$ hg evolve --continue |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
142 |
evolving 4:c41c793e0ef1 "added d" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 |
working directory is now at e83de241f751 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 |
$ hg up .^^^ |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
146 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
147 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
148 |
When there are evolved revisions but on a single branch |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
149 |
======================================================= |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
150 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
151 |
$ echo bar > c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
152 |
$ hg add c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
153 |
$ hg amend |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 |
3 new orphan changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 |
$ hg evolve --all |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 |
move:[2] added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 |
atop:[7] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
159 |
move:[5] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 |
merging c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
161 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
162 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
163 |
[1] |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 |
|
3839
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
165 |
testing that interrupted evolve shows up in morestatus |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
166 |
$ hg status -v |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
167 |
M c |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
168 |
A d |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
169 |
# The repository is in an unfinished *evolve* state. |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
170 |
|
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
171 |
# Unresolved merge conflicts: |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
172 |
# |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
173 |
# c |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
174 |
# |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
175 |
# To mark files as resolved: hg resolve --mark FILE |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
176 |
|
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
177 |
# To continue: hg evolve --continue |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
178 |
# To abort: hg evolve --abort |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
179 |
# To stop: hg evolve --stop |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
180 |
# (also see `hg help evolve.interrupted`) |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
181 |
|
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3821
diff
changeset
|
182 |
|
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
183 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
184 |
@ 8:0c41ec482070 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
185 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
186 |
o 7:125af0ed8cae added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
187 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
188 |
| * 6:e83de241f751 added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
189 |
| | () draft |
3978
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
190 |
| @ 5:e93a9161a274 added c |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
191 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
192 |
| x 2:b1661037fa25 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
193 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
194 |
| x 1:c7586e2a9264 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
195 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
196 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
197 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
198 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
199 |
$ hg evolve --abort |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
200 |
1 new orphan changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
201 |
evolve aborted |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
202 |
working directory is now at 125af0ed8cae |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
203 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
204 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
205 |
@ 7:125af0ed8cae added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
206 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
207 |
| * 6:e83de241f751 added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
208 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
209 |
| * 5:e93a9161a274 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
210 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
211 |
| * 2:b1661037fa25 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
212 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
213 |
| x 1:c7586e2a9264 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
214 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
215 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
216 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
217 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
218 |
$ cd .. |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
219 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
220 |
Testing when evolved revs are on multiple branches |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
221 |
================================================== |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
222 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
223 |
$ hg init repotwo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
224 |
$ cd repotwo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
225 |
$ echo ".*\.orig" > .hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
226 |
$ hg add .hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
227 |
$ hg ci -m "added hgignore" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
228 |
$ echo a > a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
229 |
$ hg ci -Aqm "added a" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
230 |
$ for ch in b c; do echo $ch > $ch; hg add $ch; hg ci -m "added "$ch; done; |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
231 |
$ hg up .^^ |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
232 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
233 |
$ for ch in c d; do echo $ ch > $ch; hg add $ch; hg ci -m "added "$ch; done; |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
234 |
created new head |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
235 |
$ hg up .^^ |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
236 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
237 |
$ echo foo > a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
238 |
$ hg ci -m "foo to a" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
239 |
created new head |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
240 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
241 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
242 |
@ 6:8f20d4390c21 foo to a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
243 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
244 |
| o 5:bcb1c47f8520 added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
245 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
246 |
| o 4:86d2603075a3 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
247 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
248 |
| o 3:17509928e5bf added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
249 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
250 |
| o 2:9f0c80a55ddc added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
251 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
252 |
o 1:2f913b0c9220 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
253 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
254 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
255 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
256 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
257 |
$ hg prev |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
258 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
259 |
[1] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
260 |
$ echo aa > a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
261 |
$ hg amend |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
262 |
5 new orphan changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
263 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
264 |
$ hg evolve --all |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
265 |
move:[2] added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
266 |
atop:[7] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
267 |
move:[4] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
268 |
atop:[7] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
269 |
move:[6] foo to a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
270 |
atop:[7] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
271 |
merging a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
272 |
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
273 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
274 |
[1] |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
275 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
276 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
277 |
o 9:7f8e8bd9f0b6 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
278 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
279 |
| o 8:db3b42ef4da7 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
280 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
281 |
@ 7:807e8e2ca559 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
282 |
| () draft |
3978
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
283 |
| @ 6:8f20d4390c21 foo to a |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
284 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
285 |
| | * 5:bcb1c47f8520 added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
286 |
| | | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
287 |
| | x 4:86d2603075a3 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
288 |
| |/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
289 |
| | * 3:17509928e5bf added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
290 |
| | | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
291 |
| | x 2:9f0c80a55ddc added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
292 |
| |/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
293 |
| x 1:2f913b0c9220 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
294 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
295 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
296 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
297 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
298 |
$ hg evolve --abort |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
299 |
2 new orphan changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
300 |
evolve aborted |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
301 |
working directory is now at 807e8e2ca559 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
302 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
303 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
304 |
@ 7:807e8e2ca559 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
305 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
306 |
| * 6:8f20d4390c21 foo to a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
307 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
308 |
| | * 5:bcb1c47f8520 added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
309 |
| | | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
310 |
| | * 4:86d2603075a3 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
311 |
| |/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
312 |
| | * 3:17509928e5bf added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
313 |
| | | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
314 |
| | * 2:9f0c80a55ddc added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
315 |
| |/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
316 |
| x 1:2f913b0c9220 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
317 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
318 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
319 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
320 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
321 |
$ hg status |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
322 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
323 |
$ hg diff |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
324 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
325 |
Testing when user created a new changesets on top of evolved revisions |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
326 |
====================================================================== |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
327 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
328 |
$ hg evolve --all |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
329 |
move:[2] added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
330 |
atop:[7] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
331 |
move:[4] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
332 |
atop:[7] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
333 |
move:[6] foo to a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
334 |
atop:[7] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
335 |
merging a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
336 |
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
337 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
338 |
[1] |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
339 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
340 |
o 9:7f8e8bd9f0b6 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
341 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
342 |
| o 8:db3b42ef4da7 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
343 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
344 |
@ 7:807e8e2ca559 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
345 |
| () draft |
3978
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
346 |
| @ 6:8f20d4390c21 foo to a |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
347 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
348 |
| | * 5:bcb1c47f8520 added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
349 |
| | | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
350 |
| | x 4:86d2603075a3 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
351 |
| |/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
352 |
| | * 3:17509928e5bf added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
353 |
| | | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
354 |
| | x 2:9f0c80a55ddc added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
355 |
| |/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
356 |
| x 1:2f913b0c9220 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
357 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
358 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
359 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
360 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
361 |
$ echo foo > a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
362 |
$ hg resolve -m |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
363 |
(no more unresolved files) |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
364 |
continue: hg evolve --continue |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
365 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
366 |
$ cd .. |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
367 |
$ hg init clonerepo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
368 |
$ cd repotwo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
369 |
$ hg push ../clonerepo --force |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
370 |
pushing to ../clonerepo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
371 |
searching for changes |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
372 |
adding changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
373 |
adding manifests |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
374 |
adding file changes |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
375 |
added 10 changesets with 8 changes to 5 files (+4 heads) |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
376 |
3 new obsolescence markers |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
377 |
3 new orphan changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
378 |
$ cd ../clonerepo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
379 |
$ hg up 7f8e8bd9f0b6 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
380 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
381 |
$ echo bar > bar |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
382 |
$ hg add bar |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
383 |
$ hg ci -m "made an new commit on evolved rev" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
384 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
385 |
$ hg push ../repotwo --force |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
386 |
pushing to ../repotwo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
387 |
searching for changes |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
388 |
adding changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
389 |
adding manifests |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
390 |
adding file changes |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
391 |
added 1 changesets with 1 changes to 1 files |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
392 |
$ cd ../repotwo |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
393 |
$ hg evolve --abort |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
394 |
warning: new changesets detected on destination branch |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
395 |
abort: unable to abort interrupted evolve, use 'hg evolve --stop' to stop evolve |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
396 |
[255] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
397 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
398 |
$ hg evolve --stop |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
399 |
stopped the interrupted evolve |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
400 |
working directory is now at 807e8e2ca559 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
401 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
402 |
Testing when the evolved revision turned public due to some other user actions |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
403 |
============================================================================== |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
404 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
405 |
$ hg evolve --all |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
406 |
move:[3] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
407 |
atop:[8] added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
408 |
move:[5] added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
409 |
atop:[9] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
410 |
move:[6] foo to a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
411 |
atop:[7] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
412 |
merging a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
413 |
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
414 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
415 |
[1] |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
416 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
417 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
418 |
o 12:1c476940790a added d |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
419 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
420 |
| o 11:c10a55eb0cc6 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
421 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
422 |
+---o 10:48eca1ed5478 made an new commit on evolved rev |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
423 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
424 |
o | 9:7f8e8bd9f0b6 added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
425 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
426 |
| o 8:db3b42ef4da7 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
427 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
428 |
@ 7:807e8e2ca559 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
429 |
| () draft |
3978
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
430 |
| @ 6:8f20d4390c21 foo to a |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
431 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
432 |
| x 1:2f913b0c9220 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
433 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
434 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
435 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
436 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
437 |
$ hg phase -r 1c476940790a --public |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
438 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
439 |
$ hg evolve --abort |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
440 |
cannot clean up public changesets: 1c476940790a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
441 |
abort: unable to abort interrupted evolve, use 'hg evolve --stop' to stop evolve |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
442 |
[255] |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
443 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
444 |
$ hg evolve --stop |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
445 |
stopped the interrupted evolve |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
446 |
working directory is now at 807e8e2ca559 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
447 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
448 |
$ cd .. |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
449 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
450 |
Testing that bookmark should be moved back when doing `hg evolve --abort` |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
451 |
========================================================================= |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
452 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
453 |
$ hg init repothree |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
454 |
$ cd repothree |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
455 |
$ echo ".*\.orig" > .hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
456 |
$ hg add .hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
457 |
$ hg ci -m "added hgignore" |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
458 |
$ for ch in a b c; do echo $ch > $ch; hg add $ch; hg ci -m "added "$ch; done; |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
459 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
460 |
$ hg up .^ |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
461 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
462 |
$ hg bookmark bm1 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
463 |
$ hg up .^ |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
464 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
465 |
(leaving bookmark bm1) |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
466 |
$ echo foo > c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
467 |
$ hg add c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
468 |
$ hg amend |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
469 |
2 new orphan changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
470 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
471 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
472 |
@ 4:a0086c17bfc7 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
473 |
| () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
474 |
| * 3:17509928e5bf added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
475 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
476 |
| * 2:9f0c80a55ddc added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
477 |
| | (bm1) draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
478 |
| x 1:2f913b0c9220 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
479 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
480 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
481 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
482 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
483 |
$ hg evolve --all |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
484 |
move:[2] added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
485 |
atop:[4] added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
486 |
move:[3] added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
487 |
merging c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
488 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
489 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
490 |
[1] |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
491 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
492 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
493 |
@ 5:c1f4718020e3 added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
494 |
| (bm1) draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
495 |
o 4:a0086c17bfc7 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
496 |
| () draft |
3978
fb8e44c70798
evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3976
diff
changeset
|
497 |
| @ 3:17509928e5bf added c |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
498 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
499 |
| x 2:9f0c80a55ddc added b |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
500 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
501 |
| x 1:2f913b0c9220 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
502 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
503 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
504 |
() draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
505 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
506 |
$ hg evolve --abort |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
507 |
1 new orphan changesets |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
508 |
evolve aborted |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
509 |
working directory is now at a0086c17bfc7 |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
510 |
|
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
511 |
$ hg glog |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
512 |
@ 4:a0086c17bfc7 added a |
3653
d9682c41ea2f
evolve: restore bookmarks correctly after `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3642
diff
changeset
|
513 |
| () draft |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
514 |
| * 3:17509928e5bf added c |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
515 |
| | () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
516 |
| * 2:9f0c80a55ddc added b |
3653
d9682c41ea2f
evolve: restore bookmarks correctly after `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3642
diff
changeset
|
517 |
| | (bm1) draft |
3642
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
518 |
| x 1:2f913b0c9220 added a |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
519 |
|/ () draft |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
520 |
o 0:8fa14d15e168 added hgignore |
319b1f0f4de2
evolve: add a `--abort` flag for `hg evolve` command
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
521 |
() draft |
3775
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
522 |
|
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
523 |
Testing `--abort` when conflicts are caused due to `hg next --evolve` |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
524 |
===================================================================== |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
525 |
|
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
526 |
$ hg next --evolve |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
527 |
move:[2] added b |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
528 |
atop:[4] added a |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
529 |
working directory now at c1f4718020e3 |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
530 |
$ hg next --evolve |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
531 |
move:[3] added c |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
532 |
atop:[5] added b |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
533 |
merging c |
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
534 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
535 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
536 |
[1] |
3775
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
537 |
|
fa7b94606024
tests: add a test demonstrating issue5897
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3702
diff
changeset
|
538 |
$ hg evolve --abort |
3776
2d450974bb1c
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3775
diff
changeset
|
539 |
evolve aborted |
2d450974bb1c
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3775
diff
changeset
|
540 |
working directory is now at c1f4718020e3 |
3980
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
541 |
|
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
542 |
$ ls .hg/ |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
543 |
00changelog.i |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
544 |
bookmarks |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
545 |
branch |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
546 |
cache |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
547 |
dirstate |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
548 |
last-message.txt |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
549 |
requires |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
550 |
store |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
551 |
undo.backup.bookmarks |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
552 |
undo.backup.dirstate |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
553 |
undo.bookmarks |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
554 |
undo.branch |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
555 |
undo.desc |
828b423545b1
tests: check that we delete evolvestate correctly after abort/stop
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3978
diff
changeset
|
556 |
undo.dirstate |