Mercurial > evolve
annotate tests/test-evolve-content-divergent-interrupted.t @ 6317:53d63b608230
evolve: stop preserving all of {extras} for uninterrupted evolve operations
I doubt the wisdom of doing this, but the case of completing interrupted evolves
does this, as do core commands for amend, graft, and rebase in hg ce9696193175,
bb14a81ce647, and b698abf971e7.
Note the obslog order (and DAG display) change in test-evolve-content-divergent-relocation.t
around line 131. I have no idea why that would happen, or if it's an indicator
of something subtle going on.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 07 Oct 2022 20:32:14 -0400 |
parents | 0c052cf84944 |
children | 9a41c3c293ae |
rev | line source |
---|---|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
1 ======================================================= |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
2 Tests the resolution of content divergence: interrupted |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
3 ======================================================= |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
4 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
5 This file intend to cover case where evolve has to be interrupted. |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
6 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
7 This test aims at gather test case for --abort, --continue and --stop |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
8 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
9 |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 Tests for the --abort flag for `hg evolve` command while content-divergence resolution |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 ====================================================================================== |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
13 The `--abort` flag aborts the interrupted evolve by undoing all the work which |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 was done during resolution i.e. stripping new changesets created, moving |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 bookmarks back, moving working directory back. |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 This test contains cases when `hg evolve` is doing content-divergence resolution. |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 Setup |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 ===== |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
6040
29bc269bcc96
tests: source common.sh in more tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5964
diff
changeset
|
22 $ . $TESTDIR/testlib/common.sh |
29bc269bcc96
tests: source common.sh in more tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5964
diff
changeset
|
23 |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 $ cat >> $HGRCPATH <<EOF |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 > [phases] |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 > publish = False |
5079
1f92a6aa40d6
evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
27 > [experimental] |
1f92a6aa40d6
evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
28 > evolution.allowdivergence = True |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 > [extensions] |
6040
29bc269bcc96
tests: source common.sh in more tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5964
diff
changeset
|
30 > evolve = |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 > EOF |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 $ hg init abortrepo |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 $ cd abortrepo |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 $ echo ".*\.orig" > .hgignore |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 $ hg add .hgignore |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 $ hg ci -m "added hgignore" |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 $ hg glog |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 @ 4:c41c793e0ef1 added d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 o 3:ca1b80f7960a added c |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 o 2:b1661037fa25 added b |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 o 1:c7586e2a9264 added a |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 o 0:8fa14d15e168 added hgignore |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 Creating content divergence, resolution of which will lead to conflicts |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 ----------------------------------------------------------------------- |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 $ echo bar > d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 $ hg amend |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 $ hg up c41c793e0ef1 --hidden |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 updated to hidden changeset c41c793e0ef1 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 working directory parent is obsolete! (c41c793e0ef1) |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 (use 'hg evolve' to update to its successor: e49523854bc8) |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 $ echo foobar > d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 $ hg amend |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 2 new content-divergent changesets |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 $ hg glog --hidden |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 @ 6:9c1631e352d9 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
70 | () draft content-divergent |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 | * 5:e49523854bc8 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
72 |/ () draft content-divergent |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 | x 4:c41c793e0ef1 added d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |/ () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 o 3:ca1b80f7960a added c |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 o 2:b1661037fa25 added b |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 o 1:c7586e2a9264 added a |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 o 0:8fa14d15e168 added hgignore |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4481
diff
changeset
|
84 $ hg evolve --content-divergent --no-all |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 merge:[6] added d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 with: [5] added d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 base: [4] added d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 merging d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
91 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
92 (see 'hg help evolve.interrupted') |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5647
diff
changeset
|
93 [240] |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
3839
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
95 $ hg status -v |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
96 M d |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
97 # The repository is in an unfinished *evolve* state. |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
98 |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
99 # Unresolved merge conflicts: |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
100 # |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
101 # d |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
102 # |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
103 # 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:
3832
diff
changeset
|
104 |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
105 # To continue: hg evolve --continue |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
106 # To abort: hg evolve --abort |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
107 # To stop: hg evolve --stop |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
108 # (also see `hg help evolve.interrupted`) |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
109 |
3976
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
110 $ hg parents |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
111 changeset: 6:9c1631e352d9 |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
112 tag: tip |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
113 parent: 3:ca1b80f7960a |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
114 user: test |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
115 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:
3853
diff
changeset
|
116 instability: content-divergent |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
117 summary: added d |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
118 |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
119 changeset: 5:e49523854bc8 |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
120 parent: 3:ca1b80f7960a |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
121 user: test |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
122 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:
3853
diff
changeset
|
123 instability: content-divergent |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
124 summary: added d |
d081528bb372
tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3853
diff
changeset
|
125 |
3839
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3832
diff
changeset
|
126 |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 $ hg evolve --abort |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 evolve aborted |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 working directory is now at 9c1631e352d9 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 $ hg glog --hidden |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 @ 6:9c1631e352d9 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
133 | () draft content-divergent |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 | * 5:e49523854bc8 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
135 |/ () draft content-divergent |
3773
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
136 | x 4:c41c793e0ef1 added d |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 |/ () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
138 o 3:ca1b80f7960a added c |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 o 2:b1661037fa25 added b |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
142 o 1:c7586e2a9264 added a |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 | () draft |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 o 0:8fa14d15e168 added hgignore |
958dad74e877
tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 () draft |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
146 |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
147 Creating multiple content-divergence where resolution of last one results in |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
148 conflicts and resolution of first one resulted in no new commit |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
149 ----------------------------------------------------------------------------- |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
150 |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
151 $ echo watbar > d |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
152 $ hg amend |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
153 $ hg up .^ |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
154 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
155 $ echo bar > c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
156 $ hg amend |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
157 2 new orphan changesets |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
158 $ hg up ca1b80f7960a --hidden |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
160 working directory parent is obsolete! (ca1b80f7960a) |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
161 (use 'hg evolve' to update to its successor: 2ba73e31f264) |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
162 $ echo foobar > c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
163 $ hg amend |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
164 2 new content-divergent changesets |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
165 $ echo bar > c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
166 $ hg amend |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
167 |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
168 $ hg glog --hidden |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
169 @ 10:491e10505bae added c |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
170 | () draft content-divergent |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
171 | x 9:7398f702a162 added c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
172 |/ () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
173 | * 8:2ba73e31f264 added c |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
174 |/ () draft content-divergent |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
175 | * 7:f0f1694f123e added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
176 | | () draft orphan content-divergent |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
177 | | x 6:9c1631e352d9 added d |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
178 | |/ () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
179 | | * 5:e49523854bc8 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
180 | |/ () draft orphan content-divergent |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
181 | | x 4:c41c793e0ef1 added d |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
182 | |/ () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
183 | x 3:ca1b80f7960a added c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
184 |/ () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
185 o 2:b1661037fa25 added b |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
186 | () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
187 o 1:c7586e2a9264 added a |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
188 | () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
189 o 0:8fa14d15e168 added hgignore |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
190 () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
191 |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
192 $ hg evolve --all --content-divergent |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
193 merge:[8] added c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
194 with: [10] added c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
195 base: [3] added c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
197 merge:[5] added d |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
198 with: [7] added d |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
199 base: [4] added d |
5297
a73cdef2e33f
evolve: rename `evolve_source_*` to `divergence_source_*`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5293
diff
changeset
|
200 rebasing "divergent" content-divergent changeset e49523854bc8 on 4566502c0483 |
5572
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
201 rebasing "other" content-divergent changeset f0f1694f123e on 4566502c0483 |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
202 merging d |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
203 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
204 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
205 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
206 (see 'hg help evolve.interrupted') |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5647
diff
changeset
|
207 [240] |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
208 |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
209 $ hg evolve --abort |
5572
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
210 2 new orphan changesets |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
211 2 new content-divergent changesets |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
212 evolve aborted |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
213 working directory is now at 491e10505bae |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
214 |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
215 $ hg glog --hidden |
3792
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
216 @ 10:491e10505bae added c |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
217 | () draft content-divergent |
3792
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
218 | x 9:7398f702a162 added c |
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
219 |/ () draft |
3832
fb821ed44f86
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3792
diff
changeset
|
220 | * 8:2ba73e31f264 added c |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
221 |/ () draft content-divergent |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
222 | * 7:f0f1694f123e added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
223 | | () draft orphan content-divergent |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
224 | | x 6:9c1631e352d9 added d |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
225 | |/ () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
226 | | * 5:e49523854bc8 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
227 | |/ () draft orphan content-divergent |
3791
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
228 | | x 4:c41c793e0ef1 added d |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
229 | |/ () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
230 | x 3:ca1b80f7960a added c |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
231 |/ () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
232 o 2:b1661037fa25 added b |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
233 | () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
234 o 1:c7586e2a9264 added a |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
235 | () draft |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
236 o 0:8fa14d15e168 added hgignore |
63d6d024dfb2
tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3773
diff
changeset
|
237 () draft |
3792
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
238 |
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
239 $ hg obslog -r . --all |
3832
fb821ed44f86
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3792
diff
changeset
|
240 * 2ba73e31f264 (8) added c |
5301
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5297
diff
changeset
|
241 | amended(content) from ca1b80f7960a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3832
fb821ed44f86
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3792
diff
changeset
|
242 | |
fb821ed44f86
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3792
diff
changeset
|
243 | @ 491e10505bae (10) added c |
5301
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5297
diff
changeset
|
244 | | amended(content) from 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3792
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
245 | | |
3832
fb821ed44f86
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3792
diff
changeset
|
246 | x 7398f702a162 (9) added c |
5301
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5297
diff
changeset
|
247 |/ amended(content) from ca1b80f7960a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3792
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
248 | |
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
249 x ca1b80f7960a (3) added c |
bb7d1616407f
evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3791
diff
changeset
|
250 |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
251 $ cd .. |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
252 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
253 Creating content-divergence on multiple parents when gca of divergent changesets |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
254 is parent of one of the divergents and relocating leads to conflicts |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
255 --------------------------------------------------------------------------------- |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
256 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
257 $ hg init multiparent |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
258 $ cd multiparent |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
259 $ echo ".*\.orig" > .hgignore |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
260 $ hg add .hgignore |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
261 $ hg ci -m "added hgignore" |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
262 $ for ch in a b c; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
263 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
264 $ hg glog |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
265 @ 3:ca1b80f7960a added c |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
266 | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
267 o 2:b1661037fa25 added b |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
268 | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
269 o 1:c7586e2a9264 added a |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
270 | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
271 o 0:8fa14d15e168 added hgignore |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
272 () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
273 |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
274 changes to get merge conflict during relocation |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
275 $ echo "some_changes" >> a |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
276 $ hg amend |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
277 $ echo foo > d |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
278 $ hg add d |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
279 $ hg ci -m "added d" |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
280 |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
281 $ hg rebase -r . -d .^^^ --config extensions.rebase= |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
282 rebasing 5:f8b09dd867e5 tip "added d" |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
283 $ echo bar > c |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
284 $ hg add c |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
285 $ hg amend |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
286 |
5729
3a1e07c27e4a
divergence-resolution: remove explicite hash in some command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5666
diff
changeset
|
287 $ hg up --hidden 'min(desc("added d"))' |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
288 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
289 updated to hidden changeset f8b09dd867e5 |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
290 (hidden revision 'f8b09dd867e5' was rewritten as: 6f7eaf1944c0) |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
291 working directory parent is obsolete! (f8b09dd867e5) |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
292 (use 'hg evolve' to update to its successor: 6f7eaf1944c0) |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
293 $ echo bar > d |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
294 $ echo "latest_changes" >> a |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
295 $ hg amend |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
296 2 new content-divergent changesets |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
297 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
298 $ hg glog |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
299 @ 8:a8673909e314 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
300 | () draft content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
301 | * 7:6f7eaf1944c0 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
302 | | () draft content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
303 o | 4:33c16a2e0eb8 added c |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
304 | | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
305 o | 2:b1661037fa25 added b |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
306 |/ () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
307 o 1:c7586e2a9264 added a |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
308 | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
309 o 0:8fa14d15e168 added hgignore |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
310 () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
311 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
312 $ hg evolve --content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
313 merge:[7] added d |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
314 with: [8] added d |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
315 base: [5] added d |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
316 rebasing "other" content-divergent changeset a8673909e314 on c7586e2a9264 |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
317 merging a |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
318 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
319 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
320 (see 'hg help evolve.interrupted') |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5647
diff
changeset
|
321 [240] |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
322 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
323 $ hg evolve --abort |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
324 evolve aborted |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
325 working directory is now at a8673909e314 |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
326 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
327 $ hg glog |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
328 @ 8:a8673909e314 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
329 | () draft content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
330 | * 7:6f7eaf1944c0 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
331 | | () draft content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
332 o | 4:33c16a2e0eb8 added c |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
333 | | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
334 o | 2:b1661037fa25 added b |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
335 |/ () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
336 o 1:c7586e2a9264 added a |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
337 | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
338 o 0:8fa14d15e168 added hgignore |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
339 () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
340 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
341 Creating content-divergence on multiple parents when gca of divergent changesets |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
342 is parent of one of the divergents and merging divergent leads to conflicts |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
343 --------------------------------------------------------------------------------- |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
344 |
5729
3a1e07c27e4a
divergence-resolution: remove explicite hash in some command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5666
diff
changeset
|
345 $ hg up 'min(desc("added d"))' |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
346 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
347 $ hg rm c |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
348 $ echo wat > d |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
349 $ hg amend |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
350 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
351 $ hg glog |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
352 @ 9:b6a3f3ee0c44 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
353 | () draft content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
354 | * 8:a8673909e314 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
355 | | () draft content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
356 | o 4:33c16a2e0eb8 added c |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
357 | | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
358 | o 2:b1661037fa25 added b |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
359 |/ () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
360 o 1:c7586e2a9264 added a |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
361 | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
362 o 0:8fa14d15e168 added hgignore |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
363 () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
364 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
365 $ hg evolve --content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
366 merge:[8] added d |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
367 with: [9] added d |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
368 base: [5] added d |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
369 rebasing "divergent" content-divergent changeset a8673909e314 on c7586e2a9264 |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
370 merging a |
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
371 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
372 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
373 (see 'hg help evolve.interrupted') |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5647
diff
changeset
|
374 [240] |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
375 |
5788
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
376 this test case is mainly to test that we hit merge conlict while merging the |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
377 two divergent csets, so resolving this one which happened during relocation |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
378 $ echo a > a |
5964
7204178ac04a
tests: spell out hg resolve
Anton Shestakov <av6@dwimlabs.net>
parents:
5811
diff
changeset
|
379 $ hg resolve -m |
5788
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
380 (no more unresolved files) |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
381 continue: hg evolve --continue |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
382 |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
383 $ hg evolve -c |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
384 evolving 8:a8673909e314 "added d" |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
385 merging a |
6106
0c052cf84944
tests: update for the removal of preresolve()
Anton Shestakov <av6@dwimlabs.net>
parents:
6042
diff
changeset
|
386 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
5788
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
387 merging d |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
388 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
389 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
390 unresolved merge conflicts |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
391 (see 'hg help evolve.interrupted') |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
392 [240] |
961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5787
diff
changeset
|
393 |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
394 $ hg evolve --abort |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
395 evolve aborted |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
396 working directory is now at b6a3f3ee0c44 |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
397 |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
398 $ hg glog |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
399 @ 9:b6a3f3ee0c44 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
400 | () draft content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
401 | * 8:a8673909e314 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
402 | | () draft content-divergent |
5787
32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5786
diff
changeset
|
403 | o 4:33c16a2e0eb8 added c |
3841
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
404 | | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
405 | o 2:b1661037fa25 added b |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
406 |/ () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
407 o 1:c7586e2a9264 added a |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
408 | () draft |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
409 o 0:8fa14d15e168 added hgignore |
82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3839
diff
changeset
|
410 () draft |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
411 $ cd .. |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
412 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
413 Tests for the --stop flag for `hg evolve` command while resolving content-divergence |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
414 ================================================================================== |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
415 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
416 The `--stop` flag stops the interrupted evolution and delete the state file so |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
417 user can do other things and comeback and do evolution later on |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
418 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
419 This is testing cases when `hg evolve` command is doing content-divergence resolution. |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
420 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
421 Setup |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
422 ===== |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
423 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
424 $ hg init stoprepo |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
425 $ cd stoprepo |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
426 $ echo ".*\.orig" > .hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
427 $ hg add .hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
428 $ hg ci -m "added hgignore" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
429 $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
430 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
431 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
432 @ 4:c41c793e0ef1 added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
433 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
434 o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
435 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
436 o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
437 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
438 o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
439 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
440 o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
441 () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
442 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
443 Creating content divergence, resolution of which will lead to conflicts |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
444 ----------------------------------------------------------------------- |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
445 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
446 $ echo bar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
447 $ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
448 |
5729
3a1e07c27e4a
divergence-resolution: remove explicite hash in some command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5666
diff
changeset
|
449 $ hg up 'min(desc("added d"))' --hidden |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
450 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
451 updated to hidden changeset c41c793e0ef1 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
452 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
453 working directory parent is obsolete! (c41c793e0ef1) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
454 (use 'hg evolve' to update to its successor: e49523854bc8) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
455 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
456 $ echo foobar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
457 $ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
458 2 new content-divergent changesets |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
459 $ hg glog --hidden |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
460 @ 6:9c1631e352d9 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
461 | () draft content-divergent |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
462 | * 5:e49523854bc8 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
463 |/ () draft content-divergent |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
464 | x 4:c41c793e0ef1 added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
465 |/ () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
466 o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
467 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
468 o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
469 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
470 o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
471 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
472 o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
473 () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
474 |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4481
diff
changeset
|
475 $ hg evolve --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
476 merge:[6] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
477 with: [5] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
478 base: [4] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
479 merging d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
480 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
481 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
482 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
483 (see 'hg help evolve.interrupted') |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5647
diff
changeset
|
484 [240] |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
485 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
486 $ hg evolve --stop |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
487 stopped the interrupted evolve |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
488 working directory is now at 9c1631e352d9 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
489 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
490 $ hg glog --hidden |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
491 @ 6:9c1631e352d9 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
492 | () draft content-divergent |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
493 | * 5:e49523854bc8 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
494 |/ () draft content-divergent |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
495 | x 4:c41c793e0ef1 added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
496 |/ () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
497 o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
498 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
499 o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
500 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
501 o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
502 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
503 o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
504 () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
505 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
506 Content divergence with parent change which will result in conflicts while |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
507 merging |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
508 --------------------------------------------------------------------------- |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
509 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
510 $ hg rebase -r . -d .^^^ --config extensions.rebase= |
5647
c2fab88e6d60
tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents:
5572
diff
changeset
|
511 rebasing 6:9c1631e352d9 tip "added d" |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
512 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
513 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
514 @ 7:517d4375cb72 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
515 | () draft content-divergent |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
516 | * 5:e49523854bc8 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
517 | | () draft content-divergent |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
518 | o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
519 | | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
520 | o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
521 |/ () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
522 o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
523 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
524 o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
525 () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
526 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
527 $ hg evolve --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
528 merge:[5] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
529 with: [7] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
530 base: [4] added d |
5730
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
531 rebasing "divergent" content-divergent changeset e49523854bc8 on c7586e2a9264 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
532 merging d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
533 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
534 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
535 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
536 (see 'hg help evolve.interrupted') |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5647
diff
changeset
|
537 [240] |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
538 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
539 $ hg evolve --stop |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
540 stopped the interrupted evolve |
5811
4688b7eb7e40
evolve: preserve wdir when using --stop
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5788
diff
changeset
|
541 working directory is now at 517d4375cb72 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
542 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
543 $ hg glog |
5811
4688b7eb7e40
evolve: preserve wdir when using --stop
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5788
diff
changeset
|
544 @ 7:517d4375cb72 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
545 | () draft content-divergent |
5811
4688b7eb7e40
evolve: preserve wdir when using --stop
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5788
diff
changeset
|
546 | * 5:e49523854bc8 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
547 | | () draft content-divergent |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
548 | o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
549 | | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
550 | o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
551 |/ () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
552 o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
553 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
554 o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
555 () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
556 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
557 Content-divergence with parent-change which will result in conflicts while |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
558 relocation |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
559 --------------------------------------------------------------------------- |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
560 |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
561 Making changes to make sure that it hits conflict while relocating |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
562 $ hg up -r 3 |
5811
4688b7eb7e40
evolve: preserve wdir when using --stop
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5788
diff
changeset
|
563 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
564 $ echo "some_changes" >> a |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
565 $ hg amend |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
566 1 new orphan changesets |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
567 $ hg next |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
568 move:[5] added d |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
569 atop:[8] added c |
6317
53d63b608230
evolve: stop preserving all of {extras} for uninterrupted evolve operations
Matt Harbison <matt_harbison@yahoo.com>
parents:
6106
diff
changeset
|
570 working directory is now at 543adc7eac82 |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
571 $ echo "latest_changes" >> a |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
572 $ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
573 $ hg glog |
6317
53d63b608230
evolve: stop preserving all of {extras} for uninterrupted evolve operations
Matt Harbison <matt_harbison@yahoo.com>
parents:
6106
diff
changeset
|
574 @ 10:13a3da452f7f added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
575 | () draft content-divergent |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
576 o 8:33c16a2e0eb8 added c |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
577 | () draft |
5730
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
578 | * 7:517d4375cb72 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
579 | | () draft content-divergent |
5730
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
580 o | 2:b1661037fa25 added b |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
581 |/ () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
582 o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
583 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
584 o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
585 () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
586 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
587 $ hg evolve --content-divergent |
5730
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
588 merge:[7] added d |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
589 with: [10] added d |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
590 base: [4] added d |
6317
53d63b608230
evolve: stop preserving all of {extras} for uninterrupted evolve operations
Matt Harbison <matt_harbison@yahoo.com>
parents:
6106
diff
changeset
|
591 rebasing "other" content-divergent changeset 13a3da452f7f on c7586e2a9264 |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
592 merging a |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
593 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
594 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
595 (see 'hg help evolve.interrupted') |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5647
diff
changeset
|
596 [240] |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
597 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
598 $ hg diff |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
599 diff -r c7586e2a9264 a |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
600 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
601 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
602 @@ -1,1 +1,6 @@ |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
603 foo |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
604 +<<<<<<< destination: c7586e2a9264 - test: added a |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
605 +======= |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
606 +some_changes |
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
607 +latest_changes |
6317
53d63b608230
evolve: stop preserving all of {extras} for uninterrupted evolve operations
Matt Harbison <matt_harbison@yahoo.com>
parents:
6106
diff
changeset
|
608 +>>>>>>> evolving: 13a3da452f7f - test: added d |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
609 diff -r c7586e2a9264 d |
5730
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
610 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
611 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
5730
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
612 @@ -0,0 +1,1 @@ |
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
613 +bar |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
614 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
615 $ hg evolve --stop |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
616 stopped the interrupted evolve |
6317
53d63b608230
evolve: stop preserving all of {extras} for uninterrupted evolve operations
Matt Harbison <matt_harbison@yahoo.com>
parents:
6106
diff
changeset
|
617 working directory is now at 13a3da452f7f |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
618 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
619 $ hg glog |
6317
53d63b608230
evolve: stop preserving all of {extras} for uninterrupted evolve operations
Matt Harbison <matt_harbison@yahoo.com>
parents:
6106
diff
changeset
|
620 @ 10:13a3da452f7f added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
621 | () draft content-divergent |
5786
c0122b98356c
divergence-resolution: [patch 1] fix a messed up test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5730
diff
changeset
|
622 o 8:33c16a2e0eb8 added c |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
623 | () draft |
5730
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
624 | * 7:517d4375cb72 added d |
6042
1cbafebe874b
tests: add {instabilities} to the common glog alias
Anton Shestakov <av6@dwimlabs.net>
parents:
6041
diff
changeset
|
625 | | () draft content-divergent |
5730
a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5729
diff
changeset
|
626 o | 2:b1661037fa25 added b |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
627 |/ () draft |
5811
4688b7eb7e40
evolve: preserve wdir when using --stop
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5788
diff
changeset
|
628 o 1:c7586e2a9264 added a |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
629 | () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
630 o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
631 () draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3976
diff
changeset
|
632 $ cd .. |