Mercurial > evolve
annotate tests/test-split.t @ 5275:417503ef667d
tests: add debugobsolete calls before many obslog calls
As requested by Pierre-Yves. The main reason is to catch superfluous
creation of obsmarkers, as well as any future changes to how the
obsmarkers get created.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 16 Dec 2019 11:14:39 -0800 |
parents | e2c548cc83b5 |
children | ff452675566c 1896d6bc574b |
rev | line source |
---|---|
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
1 test of the split command |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
2 ----------------------- |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
3 |
2775
1d16c9dcb825
test: use common setup for test-split.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2771
diff
changeset
|
4 $ . $TESTDIR/testlib/common.sh |
1d16c9dcb825
test: use common setup for test-split.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2771
diff
changeset
|
5 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
6 $ cat >> $HGRCPATH <<EOF |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
7 > [alias] |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
8 > glog = log -G -T "{rev}:{node|short} {desc|firstline} ({phase})\n" |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
9 > [defaults] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
10 > amend=-d "0 0" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
11 > fold=-d "0 0" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
12 > split=-d "0 0" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
13 > amend=-d "0 0" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
14 > [web] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
15 > push_ssl = false |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
16 > allow_push = * |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
17 > [phases] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
18 > publish = False |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
19 > [diff] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
20 > git = 1 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
21 > unified = 0 |
4392
c09889f81947
test-split: split now ignores diff.* settings
Anton Shestakov <av6@dwimlabs.net>
parents:
4345
diff
changeset
|
22 > [commands] |
c09889f81947
test-split: split now ignores diff.* settings
Anton Shestakov <av6@dwimlabs.net>
parents:
4345
diff
changeset
|
23 > commit.interactive.unified = 0 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
24 > [ui] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
25 > interactive = true |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
26 > [extensions] |
2775
1d16c9dcb825
test: use common setup for test-split.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2771
diff
changeset
|
27 > evolve = |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
28 > EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
29 $ mkcommit() { |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
30 > echo "$1" > "$1" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
31 > hg add "$1" |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
32 > hg ci -m "add $1" $2 $3 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
33 > } |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
34 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
35 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
36 Basic case, split a head |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
37 $ hg init testsplit |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
38 $ cd testsplit |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
39 $ mkcommit _a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
40 $ mkcommit _b |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
41 $ mkcommit _c --user other-test-user |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
42 $ mkcommit _d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
43 $ echo "change to a" >> _a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
44 $ hg amend |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
45 $ hg debugobsolete |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
46 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
47 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
48 To create commits with the number of split |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
49 $ echo 0 > num |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
50 $ cat > editor.sh << '__EOF__' |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
51 > NUM=$(cat num) |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
52 > NUM=`expr "$NUM" + 1` |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
53 > echo "$NUM" > num |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
54 > echo "split$NUM" > "$1" |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
55 > __EOF__ |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
56 $ export HGEDITOR="\"sh\" \"editor.sh\"" |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
57 $ hg split << EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
58 > y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
59 > y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
60 > y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
61 > n |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
62 > Y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
63 > y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
64 > y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
65 > EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
67 reverting _a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
68 adding _d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
69 diff --git a/_a b/_a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
70 1 hunks, 1 lines changed |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
71 examine changes to '_a'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
72 (enter ? for help) [Ynesfdaq?] y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
73 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
74 @@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
75 +change to a |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
76 record change 1/2 to '_a'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
77 (enter ? for help) [Ynesfdaq?] y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
78 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
79 diff --git a/_d b/_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
80 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
81 examine changes to '_d'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
82 (enter ? for help) [Ynesfdaq?] y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
83 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
84 @@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
85 +_d |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
86 record change 2/2 to '_d'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
87 (enter ? for help) [Ynesfdaq?] n |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
88 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
89 created new head |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
90 continue splitting? [Ycdq?] Y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
91 diff --git a/_d b/_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
92 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
93 examine changes to '_d'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
94 (enter ? for help) [Ynesfdaq?] y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
95 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
96 @@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
97 +_d |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
98 record this change to '_d'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
99 (enter ? for help) [Ynesfdaq?] y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
100 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
101 no more change to split |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
102 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
103 $ hg debugobsolete |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
104 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
3567
5ddea3b8d2a4
split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3562
diff
changeset
|
105 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'} |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2775
diff
changeset
|
106 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
107 @ changeset: 6:033b3f5ae73d |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
108 | tag: tip |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
109 | user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
110 | date: Thu Jan 01 00:00:00 1970 +0000 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
111 | summary: split2 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
112 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
113 o changeset: 5:2d8abdb827cd |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
114 | parent: 2:52149352b372 |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
115 | user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
116 | date: Thu Jan 01 00:00:00 1970 +0000 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
117 | summary: split1 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
118 | |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
119 o changeset: 2:52149352b372 |
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
120 | user: other-test-user |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
121 | date: Thu Jan 01 00:00:00 1970 +0000 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
122 | summary: add _c |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
123 | |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
124 o changeset: 1:37445b16603b |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
125 | user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
126 | date: Thu Jan 01 00:00:00 1970 +0000 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
127 | summary: add _b |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
128 | |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
129 o changeset: 0:135f39f4bd78 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
130 user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
131 date: Thu Jan 01 00:00:00 1970 +0000 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
132 summary: add _a |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
133 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
134 |
1672 | 135 Cannot split a commit with uncommitted changes |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
136 $ hg up "desc(_c)" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
137 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
138 $ echo "_cd" > _c |
2576
bfc563aaac2a
effectflag: activate effect flag on test-split.t test file
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
139 $ hg split |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
140 abort: uncommitted changes |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
141 [255] |
2786
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
142 $ hg up "desc(_c)" -C |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
143 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
144 |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
145 Cannot split public changeset |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
146 |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
147 $ hg phase --rev 'desc("_a")' |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
148 0: draft |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
149 $ hg phase --rev 'desc("_a")' --public |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
150 $ hg split --rev 'desc("_a")' |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
151 abort: cannot split public changesets: 135f39f4bd78 |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
152 (see 'hg help phases' for details) |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
153 [255] |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
154 $ hg phase --rev 'desc("_a")' --draft --force |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
155 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
156 Split a revision specified with -r |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
157 $ echo "change to b" >> _b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
158 $ hg amend -m "_cprim" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
159 2 new orphan changesets |
4576
96ce1030d2fb
tests: add --update to hg evolve to reduce test changes for the next patch
Anton Shestakov <av6@dwimlabs.net>
parents:
4499
diff
changeset
|
160 $ hg evolve --all --update |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
161 move:[5] split1 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
162 atop:[7] _cprim |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
163 move:[6] split2 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
164 working directory is now at * (glob) |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
165 $ hg log -r "desc(_cprim)" -v -p |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
166 changeset: 7:b434287e665c |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
167 parent: 1:37445b16603b |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
168 user: other-test-user |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
169 date: Thu Jan 01 00:00:00 1970 +0000 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
170 files: _b _c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
171 description: |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
172 _cprim |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
173 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
174 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
175 diff --git a/_b b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
176 --- a/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
177 +++ b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
178 @@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
179 +change to b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
180 diff --git a/_c b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
181 new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
182 --- /dev/null |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
183 +++ b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
184 @@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
185 +_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
186 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
187 $ hg split -r "desc(_cprim)" <<EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
188 > y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
189 > y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
190 > y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
191 > n |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
192 > c |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
193 > EOF |
1484
e3484e9632cd
split: don't update before it is actually needed
Laurent Charignon <lcharignon@fb.com>
parents:
1483
diff
changeset
|
194 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
195 reverting _b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
196 adding _c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
197 diff --git a/_b b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
198 1 hunks, 1 lines changed |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
199 examine changes to '_b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
200 (enter ? for help) [Ynesfdaq?] y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
201 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
202 @@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
203 +change to b |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
204 record change 1/2 to '_b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
205 (enter ? for help) [Ynesfdaq?] y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
206 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
207 diff --git a/_c b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
208 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
209 examine changes to '_c'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
210 (enter ? for help) [Ynesfdaq?] y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
211 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
212 @@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
213 +_c |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
214 record change 2/2 to '_c'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
215 (enter ? for help) [Ynesfdaq?] n |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
216 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
217 created new head |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
218 continue splitting? [Ycdq?] c |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3270
diff
changeset
|
219 2 new orphan changesets |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
220 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
221 Stop before splitting the commit completely creates a commit with all the |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
222 remaining changes |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
223 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
224 $ hg debugobsolete |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
225 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
3567
5ddea3b8d2a4
split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3562
diff
changeset
|
226 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'} |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
227 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
3562
fe16284cd95a
evolve: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
228 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
fe16284cd95a
evolve: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
229 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
3567
5ddea3b8d2a4
split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3562
diff
changeset
|
230 b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'} |
4576
96ce1030d2fb
tests: add --update to hg evolve to reduce test changes for the next patch
Anton Shestakov <av6@dwimlabs.net>
parents:
4499
diff
changeset
|
231 $ hg evolve --all --update |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
232 move:[8] split1 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
233 atop:[11] split4 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
234 move:[9] split2 |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
235 working directory is now at d74c6715e706 |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2775
diff
changeset
|
236 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
237 @ changeset: 13:d74c6715e706 |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
238 | tag: tip |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
239 | user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
240 | date: Thu Jan 01 00:00:00 1970 +0000 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
241 | summary: split2 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
242 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
243 o changeset: 12:3f134f739075 |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
244 | user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
245 | date: Thu Jan 01 00:00:00 1970 +0000 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
246 | summary: split1 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
247 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
248 o changeset: 11:1188c4216eba |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
249 | user: other-test-user |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
250 | date: Thu Jan 01 00:00:00 1970 +0000 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
251 | summary: split4 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
252 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
253 o changeset: 10:ead2066d1dbf |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
254 | parent: 1:37445b16603b |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
255 | user: other-test-user |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
256 | date: Thu Jan 01 00:00:00 1970 +0000 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
257 | summary: split3 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
258 | |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
259 o changeset: 1:37445b16603b |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
260 | user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
261 | date: Thu Jan 01 00:00:00 1970 +0000 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
262 | summary: add _b |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
263 | |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
264 o changeset: 0:135f39f4bd78 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
265 user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
266 date: Thu Jan 01 00:00:00 1970 +0000 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
267 summary: add _a |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
268 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
269 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
270 Split should move bookmarks on the last split successor and preserve the |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
271 active bookmark as active |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
272 $ hg book bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
273 $ hg book bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
274 $ echo "changetofilea" > _a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
275 $ hg amend |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
276 $ hg book |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
277 bookA 14:7a6b35779b85 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
278 * bookB 14:7a6b35779b85 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
279 $ hg log -G -r "3f134f739075::" |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
280 @ changeset: 14:7a6b35779b85 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
281 | bookmark: bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
282 | bookmark: bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
283 | tag: tip |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
284 | parent: 12:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
285 | user: test |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
286 | date: Thu Jan 01 00:00:00 1970 +0000 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
287 | summary: split2 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
288 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
289 o changeset: 12:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
290 | user: test |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
291 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
292 summary: split1 |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
293 |
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
294 $ hg split --user victor <<EOF |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
295 > y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
296 > y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
297 > n |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
298 > c |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
299 > EOF |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
300 (leaving bookmark bookB) |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
301 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
302 reverting _a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
303 adding _d |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
304 diff --git a/_a b/_a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
305 1 hunks, 2 lines changed |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
306 examine changes to '_a'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
307 (enter ? for help) [Ynesfdaq?] y |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
308 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
309 @@ -1,2 +1,1 @@ |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
310 -_a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
311 -change to a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
312 +changetofilea |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
313 record change 1/2 to '_a'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
314 (enter ? for help) [Ynesfdaq?] y |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
315 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
316 diff --git a/_d b/_d |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
317 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
318 examine changes to '_d'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
319 (enter ? for help) [Ynesfdaq?] n |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
320 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
321 created new head |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
322 continue splitting? [Ycdq?] c |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
323 $ hg log -G -r "3f134f739075::" |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
324 @ changeset: 16:452a26648478 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
325 | bookmark: bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
326 | bookmark: bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
327 | tag: tip |
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
328 | user: victor |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
329 | date: Thu Jan 01 00:00:00 1970 +0000 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
330 | summary: split6 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
331 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
332 o changeset: 15:1315679b77dc |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
333 | parent: 12:3f134f739075 |
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
334 | user: victor |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
335 | date: Thu Jan 01 00:00:00 1970 +0000 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
336 | summary: split5 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
337 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
338 o changeset: 12:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
339 | user: test |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
340 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
341 summary: split1 |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
342 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
343 $ hg book |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
344 bookA 16:452a26648478 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
345 * bookB 16:452a26648478 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
346 |
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
347 Lastest revision is selected if multiple are given to -r |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
348 $ hg split -r "desc(_a)::" |
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
349 (leaving bookmark bookB) |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
350 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
351 adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
352 diff --git a/_d b/_d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
353 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
354 examine changes to '_d'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
355 (enter ? for help) [Ynesfdaq?] abort: response expected |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
356 [255] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
357 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
358 Cannot split a commit that is not a head if instability is not allowed |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
359 $ cat >> $HGRCPATH <<EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
360 > [experimental] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
361 > evolution=createmarkers |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
362 > evolutioncommands=split |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
363 > EOF |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
364 $ hg split -r "desc(split3)" |
2786
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
365 abort: split will orphan 4 descendants |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
366 (see 'hg help evolution.instability') |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
367 [255] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
368 |
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
369 Changing evolution level to createmarkers |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
370 $ echo "[experimental]" >> $HGRCPATH |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
371 $ echo "evolution=createmarkers" >> $HGRCPATH |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
372 |
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
373 Running split without any revision operates on the parent of the working copy |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
374 $ hg split << EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
375 > q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
376 > EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
377 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
378 adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
379 diff --git a/_d b/_d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
380 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
381 examine changes to '_d'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
382 (enter ? for help) [Ynesfdaq?] q |
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
383 |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
384 abort: user quit |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
385 [255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
386 |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
387 Running split with tip revision, specified as unnamed argument |
4298
a98fa6c0d4f3
split: only accept explicit revision through the `-r` option
Boris Feld <boris.feld@octobus.net>
parents:
4294
diff
changeset
|
388 $ hg split --rev . << EOF |
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
389 > q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
390 > EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
391 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
392 adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
393 diff --git a/_d b/_d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
394 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
395 examine changes to '_d'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
396 (enter ? for help) [Ynesfdaq?] q |
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
397 |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
398 abort: user quit |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
399 [255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
400 |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
401 Running split with both unnamed and named revision arguments shows an error msg |
4298
a98fa6c0d4f3
split: only accept explicit revision through the `-r` option
Boris Feld <boris.feld@octobus.net>
parents:
4294
diff
changeset
|
402 $ hg split --rev . --rev .^ << EOF |
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
403 > q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
404 > EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
405 abort: more than one revset is given |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
406 [255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
407 |
1738
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
408 Split empty commit (issue5191) |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
409 $ hg branch new-branch |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
410 marked working directory as branch new-branch |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
411 (branches are permanent and global, did you want a bookmark?) |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
412 $ hg commit -m "empty" |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
413 $ hg split |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
414 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
415 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
416 Check that split keeps the right topic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
417 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
418 $ hg up -r tip |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
419 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
420 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
421 Add topic to the hgrc |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
422 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
423 $ echo "[extensions]" >> $HGRCPATH |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
424 $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
425 $ hg topic mytopic |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2929
diff
changeset
|
426 marked working directory as topic: mytopic |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
427 $ echo babar > babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
428 $ echo celeste > celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
429 $ hg add babar celeste |
2771
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
430 $ hg commit -m "Works on mytopic" babar celeste --user victor |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2985
diff
changeset
|
431 active topic 'mytopic' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3567
diff
changeset
|
432 (see 'hg help topics' for more information) |
2771
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
433 $ hg log -r . |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
434 changeset: 18:26f72cfaf036 |
2771
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
435 branch: new-branch |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
436 tag: tip |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
437 topic: mytopic |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
438 user: victor |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
439 date: Thu Jan 01 00:00:00 1970 +0000 |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
440 summary: Works on mytopic |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
441 |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
442 $ hg summary |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
443 parent: 18:26f72cfaf036 tip |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
444 Works on mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
445 branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
446 commit: 2 unknown (clean) |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
447 update: (current) |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
448 phases: 9 draft |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
449 topic: mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
450 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
451 Split it |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
452 |
2771
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
453 $ hg split -U << EOF |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
454 > Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
455 > Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
456 > N |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
457 > c |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
458 > Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
459 > Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
460 > EOF |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
461 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
462 adding babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
463 adding celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
464 diff --git a/babar b/babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
465 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
466 examine changes to 'babar'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
467 (enter ? for help) [Ynesfdaq?] Y |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
468 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
469 @@ -0,0 +1,1 @@ |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
470 +babar |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
471 record change 1/2 to 'babar'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
472 (enter ? for help) [Ynesfdaq?] Y |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
473 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
474 diff --git a/celeste b/celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
475 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
476 examine changes to 'celeste'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
477 (enter ? for help) [Ynesfdaq?] N |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
478 |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
479 continue splitting? [Ycdq?] c |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
480 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
481 Check that the topic is still here |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
482 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
483 $ hg log -r "tip~1::" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
484 changeset: 19:addcf498f19e |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
485 branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
486 topic: mytopic |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
487 parent: 17:fdb403258632 |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
488 user: test |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
489 date: Thu Jan 01 00:00:00 1970 +0000 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
490 summary: split7 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
491 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
492 changeset: 20:2532b288af61 |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
493 branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
494 tag: tip |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
495 topic: mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
496 user: test |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
497 date: Thu Jan 01 00:00:00 1970 +0000 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
498 summary: split8 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
499 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
500 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3015
diff
changeset
|
501 * mytopic (2 changesets) |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
502 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
503 Test split the first commit on a branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
504 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
505 $ touch SPLIT1 SPLIT2 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
506 $ hg add SPLIT1 SPLIT2 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
507 $ hg branch another-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
508 marked working directory as branch another-branch |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
509 $ hg commit -m "To be split" |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
510 $ hg log -G -l 3 |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
511 @ changeset: 21:b6bf93dd314b |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
512 | branch: another-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
513 | tag: tip |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
514 | topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
515 | user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
516 | date: Thu Jan 01 00:00:00 1970 +0000 |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
517 | summary: To be split |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
518 | |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
519 o changeset: 20:2532b288af61 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
520 | branch: new-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
521 | topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
522 | user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
523 | date: Thu Jan 01 00:00:00 1970 +0000 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
524 | summary: split8 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
525 | |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
526 o changeset: 19:addcf498f19e |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
527 | branch: new-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
528 ~ topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
529 parent: 17:fdb403258632 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
530 user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
531 date: Thu Jan 01 00:00:00 1970 +0000 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
532 summary: split7 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
533 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
534 $ hg export . |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
535 # HG changeset patch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
536 # User test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
537 # Date 0 0 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
538 # Thu Jan 01 00:00:00 1970 +0000 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
539 # Branch another-branch |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
540 # Node ID b6bf93dd314ba47b838befc7488b2223981684ea |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
541 # Parent 2532b288af61bd19239a95ae2a3ecb9b0ad4b8e1 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
542 # EXP-Topic mytopic |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
543 To be split |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
544 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
545 diff --git a/SPLIT1 b/SPLIT1 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
546 new file mode 100644 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
547 diff --git a/SPLIT2 b/SPLIT2 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
548 new file mode 100644 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
549 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
550 $ hg split -r . << EOF |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
551 > Y |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
552 > N |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
553 > Y |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
554 > Y |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
555 > EOF |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
556 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
557 adding SPLIT1 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
558 adding SPLIT2 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
559 diff --git a/SPLIT1 b/SPLIT1 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
560 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
561 examine changes to 'SPLIT1'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
562 (enter ? for help) [Ynesfdaq?] Y |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
563 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
564 diff --git a/SPLIT2 b/SPLIT2 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
565 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
566 examine changes to 'SPLIT2'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
567 (enter ? for help) [Ynesfdaq?] N |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
568 |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
569 continue splitting? [Ycdq?] Y |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
570 diff --git a/SPLIT2 b/SPLIT2 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
571 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
572 examine changes to 'SPLIT2'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
573 (enter ? for help) [Ynesfdaq?] Y |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
574 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
575 no more change to split |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
576 |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
577 The split changesets should be on the 'another-branch' |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
578 $ hg log -G -l 3 |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
579 @ changeset: 23:56a59faa8af7 |
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
580 | branch: another-branch |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
581 | tag: tip |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
582 | topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
583 | user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
584 | date: Thu Jan 01 00:00:00 1970 +0000 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
585 | summary: split10 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
586 | |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
587 o changeset: 22:75695e3e2300 |
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
588 | branch: another-branch |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
589 | topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
590 | parent: 20:2532b288af61 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
591 | user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
592 | date: Thu Jan 01 00:00:00 1970 +0000 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
593 | summary: split9 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
594 | |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
595 o changeset: 20:2532b288af61 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
596 | branch: new-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
597 ~ topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
598 user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
599 date: Thu Jan 01 00:00:00 1970 +0000 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
600 summary: split8 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
601 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
602 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
603 Try splitting the first changeset of a branch then cancel |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
604 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
605 $ hg branch yet-another-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
606 marked working directory as branch yet-another-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
607 $ touch SPLIT3 SPLIT4 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
608 $ hg add SPLIT3 SPLIT4 |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
609 $ hg commit -m "To be split again" |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
610 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
611 $ hg up "tip~1" |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
612 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
613 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
614 $ hg log -G -l 2 |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
615 o changeset: 24:9f56497dbac1 |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
616 | branch: yet-another-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
617 | tag: tip |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
618 | topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
619 | user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
620 | date: Thu Jan 01 00:00:00 1970 +0000 |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
621 | summary: To be split again |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
622 | |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
623 @ changeset: 23:56a59faa8af7 |
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
624 | branch: another-branch |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
625 ~ topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
626 user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
627 date: Thu Jan 01 00:00:00 1970 +0000 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
628 summary: split10 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
629 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
630 $ hg branch |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
631 another-branch |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
632 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
633 $ hg split -r tip << EOF |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
634 > Y |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
635 > q |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
636 > EOF |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
637 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
638 adding SPLIT3 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
639 adding SPLIT4 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
640 diff --git a/SPLIT3 b/SPLIT3 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
641 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
642 examine changes to 'SPLIT3'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
643 (enter ? for help) [Ynesfdaq?] Y |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
644 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
645 diff --git a/SPLIT4 b/SPLIT4 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
646 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
647 examine changes to 'SPLIT4'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
648 (enter ? for help) [Ynesfdaq?] q |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
649 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
650 abort: user quit |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
651 [255] |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
652 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
653 $ hg branch |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
654 another-branch |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
655 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
656 $ hg log -G -l 2 |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
657 o changeset: 24:9f56497dbac1 |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
658 | branch: yet-another-branch |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
659 | tag: tip |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
660 | topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
661 | user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
662 | date: Thu Jan 01 00:00:00 1970 +0000 |
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
663 | summary: To be split again |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
664 | |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
665 @ changeset: 23:56a59faa8af7 |
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
666 | branch: another-branch |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
667 ~ topic: mytopic |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
668 user: test |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
669 date: Thu Jan 01 00:00:00 1970 +0000 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
670 summary: split10 |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
671 |
4291
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
672 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
673 Check prompt options |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
674 -------------------- |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
675 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
676 Look at the help (both record and split helps) |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
677 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
678 $ hg split -r tip << EOF |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
679 > Y |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
680 > ? |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
681 > d |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
682 > ? |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
683 > q |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
684 > EOF |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
685 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
686 adding SPLIT3 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
687 adding SPLIT4 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
688 diff --git a/SPLIT3 b/SPLIT3 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
689 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
690 examine changes to 'SPLIT3'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
691 (enter ? for help) [Ynesfdaq?] Y |
4291
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
692 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
693 diff --git a/SPLIT4 b/SPLIT4 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
694 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
695 examine changes to 'SPLIT4'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
696 (enter ? for help) [Ynesfdaq?] ? |
4291
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
697 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
698 y - yes, record this change |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
699 n - no, skip this change |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
700 e - edit this change manually |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
701 s - skip remaining changes to this file |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
702 f - record remaining changes to this file |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
703 d - done, skip remaining changes and files |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
704 a - record all changes to all remaining files |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
705 q - quit, recording no changes |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
706 ? - ? (display help) |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
707 examine changes to 'SPLIT4'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
708 (enter ? for help) [Ynesfdaq?] d |
4291
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
709 |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
710 continue splitting? [Ycdq?] ? |
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
711 y - yes, continue selection |
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
712 c - commit, select all remaining changes |
4293
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
713 d - discard, discard remaining changes |
4292
caaa89adf3eb
split: add a way to abort a split from the prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4291
diff
changeset
|
714 q - quit, abort the split |
4291
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
715 ? - ?, display help |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
716 continue splitting? [Ycdq?] q |
4291
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
717 transaction abort! |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
718 rollback completed |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
719 abort: user quit |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
720 [255] |
4293
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
721 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
722 discard some of changeset during split |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
723 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
724 $ cat >> $HGRCPATH <<EOF |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
725 > [experimental] |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
726 > evolution=all |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
727 > evolutioncommands= |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
728 > EOF |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
729 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
730 $ hg export |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
731 # HG changeset patch |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
732 # User test |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
733 # Date 0 0 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
734 # Thu Jan 01 00:00:00 1970 +0000 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
735 # Branch another-branch |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
736 # Node ID 56a59faa8af70dc104faa905231731ffece5f18a |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
737 # Parent 75695e3e2300d316cc515c4c25bab8b825ef1433 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
738 # EXP-Topic mytopic |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
739 split10 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
740 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
741 diff --git a/SPLIT2 b/SPLIT2 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
742 new file mode 100644 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
743 $ hg add SPLIT3 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
744 $ hg amend |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
745 1 new orphan changesets |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
746 $ hg export |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
747 # HG changeset patch |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
748 # User test |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
749 # Date 0 0 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
750 # Thu Jan 01 00:00:00 1970 +0000 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
751 # Branch another-branch |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
752 # Node ID 3acb634dc68ddb4dea75a9cee982955bc1f3e8cd |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
753 # Parent 75695e3e2300d316cc515c4c25bab8b825ef1433 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
754 # EXP-Topic mytopic |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
755 split10 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
756 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
757 diff --git a/SPLIT2 b/SPLIT2 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
758 new file mode 100644 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
759 diff --git a/SPLIT3 b/SPLIT3 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
760 new file mode 100644 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
761 $ hg split << EOF |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
762 > Y |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
763 > d |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
764 > d |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
765 > EOF |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
766 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
767 adding SPLIT2 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
768 adding SPLIT3 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
769 diff --git a/SPLIT2 b/SPLIT2 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
770 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
771 examine changes to 'SPLIT2'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
772 (enter ? for help) [Ynesfdaq?] Y |
4293
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
773 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
774 diff --git a/SPLIT3 b/SPLIT3 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
775 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
776 examine changes to 'SPLIT3'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
777 (enter ? for help) [Ynesfdaq?] d |
4293
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
778 |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
779 continue splitting? [Ycdq?] d |
4293
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
780 discarding remaining changes |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
781 forgetting SPLIT3 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
782 $ hg export |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
783 # HG changeset patch |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
784 # User test |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
785 # Date 0 0 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
786 # Thu Jan 01 00:00:00 1970 +0000 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
787 # Branch another-branch |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
788 # Node ID db690d5566962489d65945c90b468b44e0b1507a |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
789 # Parent 75695e3e2300d316cc515c4c25bab8b825ef1433 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
790 # EXP-Topic mytopic |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
791 split12 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
792 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
793 diff --git a/SPLIT2 b/SPLIT2 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
794 new file mode 100644 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
795 $ hg status |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
796 ? SPLIT3 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
797 ? SPLIT4 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
798 ? editor.sh |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
799 ? num |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
800 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
801 Test restricting the split to a subset of files |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
802 ----------------------------------------------- |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
803 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
804 $ hg add SPLIT3 SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
805 $ hg amend |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
806 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
807 Only run on 2 files |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
808 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
809 (remaining changes gathered with unmatched one) |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
810 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
811 adding content in files to make sure that it prompt us to select the changes, |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
812 as it won't prompt if a file has no changes at hunk level and passed in cli |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
813 (for more look into hg db72f9f6580e which made it to not prompt "examine changes to fileX" |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
814 for files which are explicitly mentioned by user) |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
815 $ echo sp2 > SPLIT2 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
816 $ echo sp3 > SPLIT3 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
817 $ echo sp4 > SPLIT4 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
818 $ hg amend |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
819 |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
820 $ hg split SPLIT2 SPLIT3 << EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
821 > y |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
822 > s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
823 > c |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
824 > EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
825 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
826 adding SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
827 adding SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
828 adding SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
829 diff --git a/SPLIT2 b/SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
830 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
831 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
832 +sp2 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
833 record change 1/2 to 'SPLIT2'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
834 (enter ? for help) [Ynesfdaq?] y |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
835 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
836 diff --git a/SPLIT3 b/SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
837 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
838 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
839 +sp3 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
840 record change 2/2 to 'SPLIT3'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
841 (enter ? for help) [Ynesfdaq?] s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
842 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
843 continue splitting? [Ycdq?] c |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
844 |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
845 $ hg status --change '.~1' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
846 A SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
847 $ hg status --change '.' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
848 A SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
849 A SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
850 $ hg fold --from '.~1' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
851 2 changesets folded |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
852 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
853 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
854 (no remaining changes) |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
855 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
856 $ hg split SPLIT2 SPLIT3 << EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
857 > y |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
858 > s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
859 > y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
860 > y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
861 > EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
862 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
863 adding SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
864 adding SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
865 adding SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
866 diff --git a/SPLIT2 b/SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
867 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
868 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
869 +sp2 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
870 record change 1/2 to 'SPLIT2'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
871 (enter ? for help) [Ynesfdaq?] y |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
872 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
873 diff --git a/SPLIT3 b/SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
874 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
875 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
876 +sp3 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
877 record change 2/2 to 'SPLIT3'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
878 (enter ? for help) [Ynesfdaq?] s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
879 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
880 continue splitting? [Ycdq?] y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
881 diff --git a/SPLIT3 b/SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
882 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
883 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
884 +sp3 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
885 record this change to 'SPLIT3'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
886 (enter ? for help) [Ynesfdaq?] y |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
887 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
888 no more change to split |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
889 |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
890 $ hg status --change '.~2' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
891 A SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
892 $ hg status --change '.~1' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
893 A SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
894 $ hg status --change '.' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
895 A SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
896 $ hg fold --from '.~2' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
897 3 changesets folded |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
898 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
899 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
900 (only all matched selected) |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
901 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
902 $ hg split SPLIT2 SPLIT3 << EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
903 > y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
904 > y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
905 > EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
906 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
907 adding SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
908 adding SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
909 adding SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
910 diff --git a/SPLIT2 b/SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
911 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
912 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
913 +sp2 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
914 record change 1/2 to 'SPLIT2'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
915 (enter ? for help) [Ynesfdaq?] y |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
916 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
917 diff --git a/SPLIT3 b/SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
918 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
919 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
920 +sp3 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
921 record change 2/2 to 'SPLIT3'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
922 (enter ? for help) [Ynesfdaq?] y |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
923 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
924 no more change to split |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
925 $ hg status --change '.~1' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
926 A SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
927 A SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
928 $ hg status --change '.' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
929 A SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
930 $ hg fold --from '.~1' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
931 2 changesets folded |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
932 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
933 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
934 Check that discard does not alter unmatched files |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
935 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
936 $ hg split SPLIT2 SPLIT3 << EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
937 > y |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
938 > s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
939 > d |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
940 > EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
941 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
942 adding SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
943 adding SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
944 adding SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
945 diff --git a/SPLIT2 b/SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
946 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
947 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
948 +sp2 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
949 record change 1/2 to 'SPLIT2'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
950 (enter ? for help) [Ynesfdaq?] y |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
951 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
952 diff --git a/SPLIT3 b/SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
953 new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
954 @@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
955 +sp3 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
956 record change 2/2 to 'SPLIT3'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
957 (enter ? for help) [Ynesfdaq?] s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
958 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
959 continue splitting? [Ycdq?] d |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
960 discarding remaining changes |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
961 no more change to split |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
962 $ hg status --change '.~1' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
963 A SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
964 $ hg status --change '.' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
965 A SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
966 $ hg fold --from '.~1' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
967 2 changesets folded |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
968 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
969 $ hg add SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
970 $ hg amend |
4300
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
971 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
972 Non interractive run |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
973 -------------------- |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
974 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
975 No patterns |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
976 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
977 $ hg split --no-interactive |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
978 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
979 adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
980 adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
981 adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
982 abort: no files of directories specified |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
983 (do you want --interactive) |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
984 [255] |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
985 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
986 Selecting unrelated file |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
987 (should we abort?) |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
988 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
989 $ hg split --no-interactive SPLIT1 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
990 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
991 adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
992 adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
993 adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
994 no more change to split |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
995 $ hg status --change '.' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
996 A SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
997 A SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
998 A SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
999 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1000 Selecting one file |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1001 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1002 $ hg split --no-interactive SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1003 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1004 adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1005 adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1006 adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1007 no more change to split |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1008 $ hg status --change '.~1' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1009 A SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1010 $ hg status --change '.' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1011 A SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1012 A SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1013 $ hg fold --from '.~1' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1014 2 changesets folded |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1015 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1016 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1017 Selecting two files |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1018 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1019 $ hg split --no-interactive SPLIT2 SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1020 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1021 adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1022 adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1023 adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1024 no more change to split |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1025 $ hg status --change '.~1' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1026 A SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1027 A SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1028 $ hg status --change '.' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1029 A SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1030 $ hg fold --from '.~1' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1031 2 changesets folded |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1032 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1033 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1034 Selecting all files |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1035 (should we abort?) |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1036 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1037 $ hg split --no-interactive . |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1038 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1039 adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1040 adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1041 adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1042 no more change to split |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1043 $ hg status --change '.' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1044 A SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1045 A SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1046 A SPLIT4 |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1047 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1048 $ cd .. |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1049 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1050 Testing that `hg evolve` choose right destination after split && prune (issue5686) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1051 -------------------------------------------------------------------------------- |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1052 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1053 Prepare the repository: |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1054 $ hg init issue5686 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1055 $ cd issue5686 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1056 $ echo p > p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1057 $ hg ci -Amp |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1058 adding p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1059 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1060 $ for ch in a b; do echo $ch > $ch; done; |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1061 $ hg ci -Am "added a and b" |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1062 adding a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1063 adding b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1064 $ echo c > c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1065 $ hg ci -Amc |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1066 adding c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1067 $ hg glog |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1068 @ 2:ab6ca3ebca74 c (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1069 | |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1070 o 1:79f47e067e66 added a and b (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1071 | |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1072 o 0:a5a1faba8d26 p (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1073 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1074 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1075 To create commits with the number of split |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1076 $ echo 0 > num |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1077 $ cat > editor.sh << '__EOF__' |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1078 > NUM=$(cat num) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1079 > NUM=`expr "$NUM" + 1` |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1080 > echo "$NUM" > num |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1081 > echo "split$NUM" > "$1" |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1082 > __EOF__ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1083 $ export HGEDITOR="\"sh\" \"editor.sh\"" |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1084 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1085 Splitting the revision 1 to SPLIT1 and SPLIT2 which contains file a and b resp: |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1086 $ hg split -r 1 <<EOF |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1087 > y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1088 > y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1089 > n |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1090 > y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1091 > y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1092 > y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1093 > EOF |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1094 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1095 adding a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1096 adding b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1097 diff --git a/a b/a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1098 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1099 examine changes to 'a'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1100 (enter ? for help) [Ynesfdaq?] y |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1101 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1102 @@ -0,0 +1,1 @@ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1103 +a |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1104 record change 1/2 to 'a'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1105 (enter ? for help) [Ynesfdaq?] y |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1106 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1107 diff --git a/b b/b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1108 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1109 examine changes to 'b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1110 (enter ? for help) [Ynesfdaq?] n |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1111 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1112 created new head |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1113 (consider using topic for lightweight branches. See 'hg help topic') |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1114 continue splitting? [Ycdq?] y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1115 diff --git a/b b/b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1116 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1117 examine changes to 'b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1118 (enter ? for help) [Ynesfdaq?] y |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1119 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1120 @@ -0,0 +1,1 @@ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1121 +b |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1122 record this change to 'b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1123 (enter ? for help) [Ynesfdaq?] y |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1124 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1125 no more change to split |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1126 1 new orphan changesets |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1127 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1128 $ hg glog -p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1129 @ 4:5cf253fa63fa split2 (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1130 | diff --git a/b b/b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1131 | new file mode 100644 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1132 | --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1133 | +++ b/b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1134 | @@ -0,0 +1,1 @@ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1135 | +b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1136 | |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1137 o 3:88437e073cd4 split1 (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1138 | diff --git a/a b/a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1139 | new file mode 100644 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1140 | --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1141 | +++ b/a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1142 | @@ -0,0 +1,1 @@ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1143 | +a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1144 | |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1145 | * 2:ab6ca3ebca74 c (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1146 | | diff --git a/c b/c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1147 | | new file mode 100644 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1148 | | --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1149 | | +++ b/c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1150 | | @@ -0,0 +1,1 @@ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1151 | | +c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1152 | | |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1153 | x 1:79f47e067e66 added a and b (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1154 |/ diff --git a/a b/a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1155 | new file mode 100644 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1156 | --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1157 | +++ b/a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1158 | @@ -0,0 +1,1 @@ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1159 | +a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1160 | diff --git a/b b/b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1161 | new file mode 100644 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1162 | --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1163 | +++ b/b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1164 | @@ -0,0 +1,1 @@ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1165 | +b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1166 | |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1167 o 0:a5a1faba8d26 p (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1168 diff --git a/p b/p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1169 new file mode 100644 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1170 --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1171 +++ b/p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1172 @@ -0,0 +1,1 @@ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1173 +p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1174 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1175 Now if we prune revision 4 the expected destination of orphan cset 2 is 3. Lets |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1176 check evolve does as expected: |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1177 Pruning revision 4 (current one): |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1178 $ hg prune . |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1179 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4613
30a544904238
messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents:
4577
diff
changeset
|
1180 working directory is now at 88437e073cd4 |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1181 1 changesets pruned |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1182 $ hg evolve -r 2 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1183 move:[2] c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1184 atop:[3] split1 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1185 $ hg glog |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4576
diff
changeset
|
1186 o 5:21a63bd6ee88 c (draft) |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1187 | |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4576
diff
changeset
|
1188 @ 3:88437e073cd4 split1 (draft) |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1189 | |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1190 o 0:a5a1faba8d26 p (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1191 |
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1192 $ cd .. |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1193 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1194 Testing that `hg split` preserve the phase of splitting cset(issue6048) |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1195 ----------------------------------------------------------------------- |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1196 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1197 Prepare the repository: |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1198 $ hg init issue6048 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1199 $ cd issue6048 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1200 $ echo a > a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1201 $ hg ci -Am "added a" |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1202 adding a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1203 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1204 $ echo b > b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1205 $ echo c > c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1206 $ hg add b c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1207 $ hg ci -m "added b c" --secret |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1208 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1209 $ hg glog -l1 -p --git |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1210 @ 1:12e9cc39ba19 added b c (secret) |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1211 | diff --git a/b b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1212 ~ new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1213 --- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1214 +++ b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1215 @@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1216 +b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1217 diff --git a/c b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1218 new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1219 --- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1220 +++ b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1221 @@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1222 +c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1223 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1224 To create commits with the number of split |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1225 $ echo 0 > num |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1226 $ cat > editor.sh << '__EOF__' |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1227 > NUM=$(cat num) |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1228 > NUM=`expr "$NUM" + 1` |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1229 > echo "$NUM" > num |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1230 > echo "split$NUM" > "$1" |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1231 > __EOF__ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1232 $ export HGEDITOR="\"sh\" \"editor.sh\"" |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1233 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1234 Splitting |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1235 $ hg split -r . << EOF |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1236 > y |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1237 > y |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1238 > n |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1239 > c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1240 > EOF |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1241 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1242 adding b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1243 adding c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1244 diff --git a/b b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1245 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1246 examine changes to 'b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1247 (enter ? for help) [Ynesfdaq?] y |
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1248 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1249 @@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1250 +b |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1251 record change 1/2 to 'b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1252 (enter ? for help) [Ynesfdaq?] y |
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1253 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1254 diff --git a/c b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1255 new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1256 examine changes to 'c'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4613
diff
changeset
|
1257 (enter ? for help) [Ynesfdaq?] n |
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1258 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1259 created new head |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1260 (consider using topic for lightweight branches. See 'hg help topic') |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1261 continue splitting? [Ycdq?] c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1262 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1263 $ hg glog --git -p |
4410
8087e9a0f902
split: make sure hg split preserve the phase of splitting cset (issue6048)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4409
diff
changeset
|
1264 @ 3:1f8c09b13fa2 split2 (secret) |
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1265 | diff --git a/c b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1266 | new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1267 | --- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1268 | +++ b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1269 | @@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1270 | +c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1271 | |
4410
8087e9a0f902
split: make sure hg split preserve the phase of splitting cset (issue6048)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4409
diff
changeset
|
1272 o 2:bcba06966846 split1 (secret) |
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1273 | diff --git a/b b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1274 | new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1275 | --- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1276 | +++ b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1277 | @@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1278 | +b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1279 | |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1280 o 0:9092f1db7931 added a (draft) |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1281 diff --git a/a b/a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1282 new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1283 --- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1284 +++ b/a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1285 @@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1286 +a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1287 |