author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 24 Apr 2019 14:38:26 +0200 | |
changeset 4574 | 5e8c47c553db |
parent 4499 | 90f94231db5d |
child 4502 | 84512556e148 |
child 4576 | 96ce1030d2fb |
permissions | -rw-r--r-- |
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 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
71 |
examine changes to '_a'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
72 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
73 |
@@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
74 |
+change to a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
75 |
record change 1/2 to '_a'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
76 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
77 |
diff --git a/_d b/_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
78 |
new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
79 |
examine changes to '_d'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
80 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
81 |
@@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
82 |
+_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
83 |
record change 2/2 to '_d'? [Ynesfdaq?] n |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
84 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
85 |
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
|
86 |
continue splitting? [Ycdq?] Y |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
87 |
diff --git a/_d b/_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
88 |
new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
89 |
examine changes to '_d'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
90 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
91 |
@@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
92 |
+_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
93 |
record this change to '_d'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
94 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
95 |
no more change to split |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
96 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
97 |
$ hg debugobsolete |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
98 |
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
|
99 |
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
|
100 |
$ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
101 |
@ changeset: 6:033b3f5ae73d |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
102 |
| tag: tip |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
103 |
| user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
104 |
| 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
|
105 |
| summary: split2 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
106 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
107 |
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
|
108 |
| parent: 2:52149352b372 |
1482
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: split1 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
112 |
| |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
113 |
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
|
114 |
| user: other-test-user |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
115 |
| 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
|
116 |
| summary: add _c |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
117 |
| |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
118 |
o changeset: 1:37445b16603b |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
119 |
| user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
120 |
| 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
|
121 |
| summary: add _b |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
122 |
| |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
123 |
o changeset: 0:135f39f4bd78 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
124 |
user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
125 |
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
|
126 |
summary: add _a |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
127 |
|
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
128 |
|
1672 | 129 |
Cannot split a commit with uncommitted changes |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
130 |
$ hg up "desc(_c)" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
131 |
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
|
132 |
$ 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
|
133 |
$ hg split |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
134 |
abort: uncommitted changes |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
135 |
[255] |
2786
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
136 |
$ hg up "desc(_c)" -C |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
137 |
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
|
138 |
|
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
139 |
Cannot split public changeset |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
140 |
|
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
141 |
$ hg phase --rev 'desc("_a")' |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
142 |
0: draft |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
143 |
$ 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
|
144 |
$ hg split --rev 'desc("_a")' |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
145 |
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
|
146 |
(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
|
147 |
[255] |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
148 |
$ hg phase --rev 'desc("_a")' --draft --force |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
149 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
150 |
Split a revision specified with -r |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
151 |
$ echo "change to b" >> _b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
152 |
$ hg amend -m "_cprim" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
153 |
2 new orphan changesets |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
154 |
$ hg evolve --all |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
155 |
move:[5] split1 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
156 |
atop:[7] _cprim |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
157 |
move:[6] split2 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
158 |
working directory is now at * (glob) |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
159 |
$ 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
|
160 |
changeset: 7:b434287e665c |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
161 |
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
|
162 |
user: other-test-user |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
163 |
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
|
164 |
files: _b _c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
165 |
description: |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
166 |
_cprim |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
167 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
168 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
169 |
diff --git a/_b b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
170 |
--- a/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
171 |
+++ b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
172 |
@@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
173 |
+change to b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
174 |
diff --git a/_c b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
175 |
new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
176 |
--- /dev/null |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
177 |
+++ b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
178 |
@@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
179 |
+_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
180 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
181 |
$ hg split -r "desc(_cprim)" <<EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
182 |
> y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
183 |
> y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
184 |
> y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
185 |
> n |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
186 |
> c |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
187 |
> EOF |
1484
e3484e9632cd
split: don't update before it is actually needed
Laurent Charignon <lcharignon@fb.com>
parents:
1483
diff
changeset
|
188 |
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
|
189 |
reverting _b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
190 |
adding _c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
191 |
diff --git a/_b b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
192 |
1 hunks, 1 lines changed |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
193 |
examine changes to '_b'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
194 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
195 |
@@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
196 |
+change to b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
197 |
record change 1/2 to '_b'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
198 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
199 |
diff --git a/_c b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
200 |
new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
201 |
examine changes to '_c'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
202 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
203 |
@@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
204 |
+_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
205 |
record change 2/2 to '_c'? [Ynesfdaq?] n |
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 |
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
|
208 |
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
|
209 |
2 new orphan changesets |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
210 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
211 |
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
|
212 |
remaining changes |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
213 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
214 |
$ hg debugobsolete |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
215 |
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
|
216 |
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
|
217 |
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
|
218 |
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
|
219 |
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
|
220 |
b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'} |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
221 |
$ hg evolve --all |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
222 |
move:[8] split1 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
223 |
atop:[11] split4 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
224 |
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
|
225 |
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
|
226 |
$ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
227 |
@ changeset: 13:d74c6715e706 |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
228 |
| tag: tip |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
229 |
| user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
230 |
| 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
|
231 |
| summary: split2 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
232 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
233 |
o changeset: 12:3f134f739075 |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
234 |
| user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
235 |
| 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
|
236 |
| summary: split1 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
237 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
238 |
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
|
239 |
| user: other-test-user |
1483
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: split4 |
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: 10:ead2066d1dbf |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
244 |
| 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
|
245 |
| user: other-test-user |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
246 |
| 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
|
247 |
| summary: split3 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
248 |
| |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
249 |
o changeset: 1:37445b16603b |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
250 |
| user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
251 |
| 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
|
252 |
| summary: add _b |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
253 |
| |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
254 |
o changeset: 0:135f39f4bd78 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
255 |
user: test |
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: add _a |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
258 |
|
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
259 |
|
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
260 |
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
|
261 |
active bookmark as active |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
262 |
$ hg book bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
263 |
$ hg book bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
264 |
$ echo "changetofilea" > _a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
265 |
$ hg amend |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
266 |
$ hg book |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
267 |
bookA 14:7a6b35779b85 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
268 |
* bookB 14:7a6b35779b85 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
269 |
$ hg log -G -r "3f134f739075::" |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
270 |
@ changeset: 14:7a6b35779b85 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
271 |
| bookmark: bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
272 |
| bookmark: bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
273 |
| tag: tip |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
274 |
| parent: 12:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
275 |
| user: test |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
276 |
| 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
|
277 |
| summary: split2 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
278 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
279 |
o changeset: 12:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
280 |
| 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
|
281 |
~ 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
|
282 |
summary: split1 |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
283 |
|
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
284 |
$ 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
|
285 |
> y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
286 |
> y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
287 |
> n |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
288 |
> c |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
289 |
> EOF |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
290 |
(leaving bookmark bookB) |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
291 |
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
|
292 |
reverting _a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
293 |
adding _d |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
294 |
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
|
295 |
1 hunks, 2 lines changed |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
296 |
examine changes to '_a'? [Ynesfdaq?] y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
297 |
|
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
298 |
@@ -1,2 +1,1 @@ |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
299 |
-_a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
300 |
-change to a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
301 |
+changetofilea |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
302 |
record change 1/2 to '_a'? [Ynesfdaq?] y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
303 |
|
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
304 |
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
|
305 |
new file mode 100644 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
306 |
examine changes to '_d'? [Ynesfdaq?] n |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
307 |
|
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
308 |
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
|
309 |
continue splitting? [Ycdq?] c |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
310 |
$ hg log -G -r "3f134f739075::" |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
311 |
@ changeset: 16:452a26648478 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
312 |
| bookmark: bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
313 |
| bookmark: bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
314 |
| tag: tip |
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
315 |
| user: victor |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
316 |
| 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
|
317 |
| summary: split6 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
318 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
319 |
o changeset: 15:1315679b77dc |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
320 |
| parent: 12:3f134f739075 |
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
321 |
| user: victor |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
322 |
| 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
|
323 |
| summary: split5 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
324 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
325 |
o changeset: 12:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
326 |
| 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
|
327 |
~ 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
|
328 |
summary: split1 |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
329 |
|
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
330 |
$ hg book |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
331 |
bookA 16:452a26648478 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
332 |
* bookB 16:452a26648478 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
333 |
|
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
334 |
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
|
335 |
$ 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
|
336 |
(leaving bookmark bookB) |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
337 |
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
|
338 |
adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
339 |
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
|
340 |
new file mode 100644 |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
341 |
examine changes to '_d'? [Ynesfdaq?] abort: response expected |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
342 |
[255] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
343 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
344 |
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
|
345 |
$ cat >> $HGRCPATH <<EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
346 |
> [experimental] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
347 |
> evolution=createmarkers |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
348 |
> evolutioncommands=split |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
349 |
> EOF |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
350 |
$ 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
|
351 |
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
|
352 |
(see 'hg help evolution.instability') |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
353 |
[255] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
354 |
|
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
355 |
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
|
356 |
$ echo "[experimental]" >> $HGRCPATH |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
357 |
$ echo "evolution=createmarkers" >> $HGRCPATH |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
358 |
|
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
359 |
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
|
360 |
$ hg split << EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
361 |
> q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
362 |
> EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
363 |
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
|
364 |
adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
365 |
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
|
366 |
new file mode 100644 |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
367 |
examine changes to '_d'? [Ynesfdaq?] q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
368 |
|
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
369 |
abort: user quit |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
370 |
[255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
371 |
|
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
372 |
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
|
373 |
$ 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
|
374 |
> q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
375 |
> EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
376 |
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
|
377 |
adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
378 |
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
|
379 |
new file mode 100644 |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
380 |
examine changes to '_d'? [Ynesfdaq?] q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
381 |
|
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
382 |
abort: user quit |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
383 |
[255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
384 |
|
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
385 |
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
|
386 |
$ 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
|
387 |
> q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
388 |
> EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
389 |
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
|
390 |
[255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
391 |
|
1738
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
392 |
Split empty commit (issue5191) |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
393 |
$ hg branch new-branch |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
394 |
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
|
395 |
(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
|
396 |
$ hg commit -m "empty" |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
397 |
$ hg split |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
398 |
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
|
399 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
400 |
Check that split keeps the right topic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
401 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
402 |
$ hg up -r tip |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
403 |
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
|
404 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
405 |
Add topic to the hgrc |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
406 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
407 |
$ echo "[extensions]" >> $HGRCPATH |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
408 |
$ 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
|
409 |
$ 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
|
410 |
marked working directory as topic: mytopic |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
411 |
$ echo babar > babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
412 |
$ echo celeste > celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
413 |
$ 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
|
414 |
$ 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
|
415 |
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
|
416 |
(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
|
417 |
$ hg log -r . |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
418 |
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
|
419 |
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
|
420 |
tag: tip |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
421 |
topic: mytopic |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
422 |
user: victor |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
423 |
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
|
424 |
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
|
425 |
|
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
426 |
$ hg summary |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
427 |
parent: 18:26f72cfaf036 tip |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
428 |
Works on mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
429 |
branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
430 |
commit: 2 unknown (clean) |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
431 |
update: (current) |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
432 |
phases: 9 draft |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
433 |
topic: mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
434 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
435 |
Split it |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
436 |
|
2771
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
437 |
$ hg split -U << EOF |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
438 |
> Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
439 |
> Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
440 |
> N |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
441 |
> c |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
442 |
> Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
443 |
> Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
444 |
> EOF |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
445 |
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
|
446 |
adding babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
447 |
adding celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
448 |
diff --git a/babar b/babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
449 |
new file mode 100644 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
450 |
examine changes to 'babar'? [Ynesfdaq?] Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
451 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
452 |
@@ -0,0 +1,1 @@ |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
453 |
+babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
454 |
record change 1/2 to 'babar'? [Ynesfdaq?] Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
455 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
456 |
diff --git a/celeste b/celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
457 |
new file mode 100644 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
458 |
examine changes to 'celeste'? [Ynesfdaq?] N |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
459 |
|
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
460 |
continue splitting? [Ycdq?] c |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
461 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
462 |
Check that the topic is still here |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
463 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
464 |
$ 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
|
465 |
changeset: 19:addcf498f19e |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
466 |
branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
467 |
topic: mytopic |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
468 |
parent: 17:fdb403258632 |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
469 |
user: test |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
470 |
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
|
471 |
summary: split7 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
472 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
473 |
changeset: 20:2532b288af61 |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
474 |
branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
475 |
tag: tip |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
476 |
topic: mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
477 |
user: test |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
478 |
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
|
479 |
summary: split8 |
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 |
$ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3015
diff
changeset
|
482 |
* 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
|
483 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
484 |
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
|
485 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
486 |
$ 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
|
487 |
$ 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
|
488 |
$ 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
|
489 |
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
|
490 |
$ 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
|
491 |
$ 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
|
492 |
@ 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
|
493 |
| 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
|
494 |
| 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
|
495 |
| 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
|
496 |
| 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
|
497 |
| 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
|
498 |
| 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
|
499 |
| |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
500 |
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
|
501 |
| 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
|
502 |
| 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
|
503 |
| 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
|
504 |
| 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
|
505 |
| 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
|
506 |
| |
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 |
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
|
508 |
| 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
|
509 |
~ 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
|
510 |
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
|
511 |
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
|
512 |
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
|
513 |
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
|
514 |
|
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 |
$ 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
|
516 |
# 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
|
517 |
# 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
|
518 |
# 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
|
519 |
# 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
|
520 |
# 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
|
521 |
# 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
|
522 |
# 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
|
523 |
# 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
|
524 |
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
|
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 |
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
|
527 |
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
|
528 |
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
|
529 |
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
|
530 |
|
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 |
$ 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
|
532 |
> 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
|
533 |
> N |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
534 |
> 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
|
535 |
> 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
|
536 |
> 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
|
537 |
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
|
538 |
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
|
539 |
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
|
540 |
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
|
541 |
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
|
542 |
examine changes to 'SPLIT1'? [Ynesfdaq?] 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
|
543 |
|
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 |
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
|
545 |
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
|
546 |
examine changes to 'SPLIT2'? [Ynesfdaq?] N |
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 |
|
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
548 |
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
|
549 |
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
|
550 |
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
|
551 |
examine changes to 'SPLIT2'? [Ynesfdaq?] 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 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
553 |
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
|
554 |
|
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4411
diff
changeset
|
555 |
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
|
556 |
$ 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
|
557 |
@ changeset: 23:56a59faa8af7 |
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
558 |
| 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
|
559 |
| 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
|
560 |
| 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
|
561 |
| 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
|
562 |
| 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
|
563 |
| 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
|
564 |
| |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
565 |
o changeset: 22:75695e3e2300 |
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
566 |
| 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
|
567 |
| 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
|
568 |
| 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
|
569 |
| 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
|
570 |
| 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
|
571 |
| 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
|
572 |
| |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
573 |
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
|
574 |
| 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
|
575 |
~ 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
|
576 |
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
|
577 |
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
|
578 |
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
|
579 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
580 |
|
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 |
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
|
582 |
|
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 |
$ 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
|
584 |
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
|
585 |
$ 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
|
586 |
$ 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
|
587 |
$ 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
|
588 |
|
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 |
$ 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
|
590 |
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
|
591 |
|
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 |
$ 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
|
593 |
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
|
594 |
| 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
|
595 |
| 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
|
596 |
| 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
|
597 |
| 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
|
598 |
| 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
|
599 |
| 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
|
600 |
| |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
601 |
@ changeset: 23:56a59faa8af7 |
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
602 |
| 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
|
603 |
~ 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
|
604 |
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
|
605 |
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
|
606 |
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
|
607 |
|
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 branch |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
609 |
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
|
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 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
|
612 |
> 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
|
613 |
> 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
|
614 |
> 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
|
615 |
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
|
616 |
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
|
617 |
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
|
618 |
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
|
619 |
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
|
620 |
examine changes to 'SPLIT3'? [Ynesfdaq?] 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
|
621 |
|
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 |
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
|
623 |
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
|
624 |
examine changes to 'SPLIT4'? [Ynesfdaq?] 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
|
625 |
|
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 |
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
|
627 |
[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
|
628 |
|
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 |
$ hg branch |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
630 |
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
|
631 |
|
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 |
$ 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
|
633 |
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
|
634 |
| 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
|
635 |
| 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
|
636 |
| 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
|
637 |
| 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
|
638 |
| 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
|
639 |
| 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
|
640 |
| |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
641 |
@ changeset: 23:56a59faa8af7 |
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
642 |
| 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
|
643 |
~ 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
|
644 |
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
|
645 |
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
|
646 |
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
|
647 |
|
4291
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
648 |
|
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
649 |
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
|
650 |
-------------------- |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
651 |
|
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
652 |
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
|
653 |
|
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
654 |
$ 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
|
655 |
> Y |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
656 |
> ? |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
657 |
> d |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
658 |
> ? |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
659 |
> q |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
660 |
> EOF |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
661 |
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
|
662 |
adding SPLIT3 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
663 |
adding SPLIT4 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
664 |
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
|
665 |
new file mode 100644 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
666 |
examine changes to 'SPLIT3'? [Ynesfdaq?] Y |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
667 |
|
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
668 |
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
|
669 |
new file mode 100644 |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
670 |
examine changes to 'SPLIT4'? [Ynesfdaq?] ? |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
671 |
|
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
672 |
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
|
673 |
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
|
674 |
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
|
675 |
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
|
676 |
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
|
677 |
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
|
678 |
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
|
679 |
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
|
680 |
? - ? (display help) |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
681 |
examine changes to 'SPLIT4'? [Ynesfdaq?] d |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
682 |
|
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
683 |
continue splitting? [Ycdq?] ? |
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
684 |
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
|
685 |
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
|
686 |
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
|
687 |
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
|
688 |
? - ?, display help |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
689 |
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
|
690 |
transaction abort! |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
691 |
rollback completed |
8f54ab5dd4e2
split: add a help entry to the final prompt
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4122
diff
changeset
|
692 |
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
|
693 |
[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
|
694 |
|
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
695 |
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
|
696 |
|
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
697 |
$ 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
|
698 |
> [experimental] |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
699 |
> 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
|
700 |
> evolutioncommands= |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
701 |
> EOF |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
702 |
|
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
703 |
$ 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
|
704 |
# 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
|
705 |
# 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
|
706 |
# 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
|
707 |
# 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
|
708 |
# 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
|
709 |
# 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
|
710 |
# 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
|
711 |
# 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
|
712 |
split10 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
713 |
|
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
714 |
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
|
715 |
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
|
716 |
$ 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
|
717 |
$ 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
|
718 |
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
|
719 |
$ 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
|
720 |
# 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
|
721 |
# 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
|
722 |
# 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
|
723 |
# 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
|
724 |
# 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
|
725 |
# 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
|
726 |
# 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
|
727 |
# 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
|
728 |
split10 |
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 |
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
|
731 |
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
|
732 |
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
|
733 |
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
|
734 |
$ 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
|
735 |
> Y |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
736 |
> d |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
737 |
> d |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
738 |
> EOF |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
739 |
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
|
740 |
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
|
741 |
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
|
742 |
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
|
743 |
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
|
744 |
examine changes to 'SPLIT2'? [Ynesfdaq?] Y |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
745 |
|
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
746 |
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
|
747 |
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
|
748 |
examine changes to 'SPLIT3'? [Ynesfdaq?] d |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
749 |
|
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
750 |
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
|
751 |
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
|
752 |
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
|
753 |
$ 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
|
754 |
# 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
|
755 |
# 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
|
756 |
# 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
|
757 |
# 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
|
758 |
# 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
|
759 |
# 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
|
760 |
# 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
|
761 |
# 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
|
762 |
split12 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
763 |
|
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
764 |
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
|
765 |
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
|
766 |
$ 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
|
767 |
? SPLIT3 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
768 |
? SPLIT4 |
d4902d48d095
split: add a option to discard remaining change during split
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4292
diff
changeset
|
769 |
? 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
|
770 |
? num |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
771 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
772 |
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
|
773 |
----------------------------------------------- |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
774 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
775 |
$ 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
|
776 |
$ hg amend |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
777 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
778 |
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
|
779 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
780 |
(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
|
781 |
|
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
782 |
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
|
783 |
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
|
784 |
(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
|
785 |
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
|
786 |
$ echo sp2 > SPLIT2 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
787 |
$ echo sp3 > SPLIT3 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
788 |
$ echo sp4 > SPLIT4 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
789 |
$ hg amend |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
790 |
|
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
791 |
$ 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
|
792 |
> y |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
793 |
> s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
794 |
> c |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
795 |
> EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
796 |
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
|
797 |
adding SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
798 |
adding SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
799 |
adding SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
800 |
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
|
801 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
802 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
803 |
+sp2 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
804 |
record change 1/2 to 'SPLIT2'? [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
|
805 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
806 |
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
|
807 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
808 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
809 |
+sp3 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
810 |
record change 2/2 to 'SPLIT3'? [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
|
811 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
812 |
continue splitting? [Ycdq?] c |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
813 |
|
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
814 |
$ 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
|
815 |
A SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
816 |
$ 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
|
817 |
A SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
818 |
A SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
819 |
$ 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
|
820 |
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
|
821 |
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
|
822 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
823 |
(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
|
824 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
825 |
$ 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
|
826 |
> y |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
827 |
> s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
828 |
> y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
829 |
> y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
830 |
> EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
831 |
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
|
832 |
adding SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
833 |
adding SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
834 |
adding SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
835 |
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
|
836 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
837 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
838 |
+sp2 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
839 |
record change 1/2 to 'SPLIT2'? [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
|
840 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
841 |
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
|
842 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
843 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
844 |
+sp3 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
845 |
record change 2/2 to 'SPLIT3'? [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
|
846 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
847 |
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
|
848 |
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
|
849 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
850 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
851 |
+sp3 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
852 |
record this change to 'SPLIT3'? [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
|
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 more change to split |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
855 |
|
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
856 |
$ 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
|
857 |
A SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
858 |
$ 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
|
859 |
A SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
860 |
$ 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
|
861 |
A SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
862 |
$ 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
|
863 |
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
|
864 |
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
|
865 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
866 |
(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
|
867 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
868 |
$ 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
|
869 |
> y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
870 |
> y |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
871 |
> EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
872 |
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
|
873 |
adding SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
874 |
adding SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
875 |
adding SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
876 |
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
|
877 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
878 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
879 |
+sp2 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
880 |
record change 1/2 to 'SPLIT2'? [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
|
881 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
882 |
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
|
883 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
884 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
885 |
+sp3 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
886 |
record change 2/2 to 'SPLIT3'? [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 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
889 |
$ 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
|
890 |
A SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
891 |
A SPLIT3 |
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 '.' |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
893 |
A SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
894 |
$ 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
|
895 |
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
|
896 |
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
|
897 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
898 |
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
|
899 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
900 |
$ 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
|
901 |
> y |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
902 |
> s |
4299
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
903 |
> d |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
904 |
> EOF |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
905 |
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
|
906 |
adding SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
907 |
adding SPLIT3 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
908 |
adding SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
909 |
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
|
910 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
911 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
912 |
+sp2 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
913 |
record change 1/2 to 'SPLIT2'? [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
|
914 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
915 |
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
|
916 |
new file mode 100644 |
4499
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
917 |
@@ -0,0 +1,1 @@ |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
918 |
+sp3 |
90f94231db5d
evolve: compat patch for recordfilter change in mercurial
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4455
diff
changeset
|
919 |
record change 2/2 to 'SPLIT3'? [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
|
920 |
|
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
921 |
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
|
922 |
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
|
923 |
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
|
924 |
$ 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
|
925 |
A SPLIT2 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
926 |
$ 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
|
927 |
A SPLIT4 |
4af0235e7b0b
split: take file patterns to limit selection on matching file patterns
Boris Feld <boris.feld@octobus.net>
parents:
4298
diff
changeset
|
928 |
$ 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
|
929 |
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
|
930 |
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
|
931 |
$ 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
|
932 |
$ hg amend |
4300
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
933 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
934 |
Non interractive run |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
935 |
-------------------- |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
936 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
937 |
No patterns |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
938 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
939 |
$ hg split --no-interactive |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
940 |
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
|
941 |
adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
942 |
adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
943 |
adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
944 |
abort: no files of directories specified |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
945 |
(do you want --interactive) |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
946 |
[255] |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
947 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
948 |
Selecting unrelated file |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
949 |
(should we abort?) |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
950 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
951 |
$ hg split --no-interactive SPLIT1 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
952 |
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
|
953 |
adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
954 |
adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
955 |
adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
956 |
no more change to split |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
957 |
$ hg status --change '.' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
958 |
A SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
959 |
A SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
960 |
A SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
961 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
962 |
Selecting one file |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
963 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
964 |
$ hg split --no-interactive SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
965 |
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
|
966 |
adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
967 |
adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
968 |
adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
969 |
no more change to split |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
970 |
$ hg status --change '.~1' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
971 |
A SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
972 |
$ hg status --change '.' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
973 |
A SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
974 |
A SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
975 |
$ hg fold --from '.~1' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
976 |
2 changesets folded |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
977 |
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
|
978 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
979 |
Selecting two files |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
980 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
981 |
$ hg split --no-interactive SPLIT2 SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
982 |
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
|
983 |
adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
984 |
adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
985 |
adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
986 |
no more change to split |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
987 |
$ hg status --change '.~1' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
988 |
A SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
989 |
A SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
990 |
$ hg status --change '.' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
991 |
A SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
992 |
$ hg fold --from '.~1' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
993 |
2 changesets folded |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
994 |
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
|
995 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
996 |
Selecting all files |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
997 |
(should we abort?) |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
998 |
|
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
999 |
$ hg split --no-interactive . |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1000 |
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
|
1001 |
adding SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1002 |
adding SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1003 |
adding SPLIT4 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1004 |
no more change to split |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1005 |
$ hg status --change '.' |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1006 |
A SPLIT2 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1007 |
A SPLIT3 |
702f7e1d0b01
split: add a --interactive flag
Boris Feld <boris.feld@octobus.net>
parents:
4299
diff
changeset
|
1008 |
A SPLIT4 |
4345
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1009 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1010 |
$ cd .. |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1011 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1012 |
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
|
1013 |
-------------------------------------------------------------------------------- |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1014 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1015 |
Prepare the repository: |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1016 |
$ hg init issue5686 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1017 |
$ cd issue5686 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1018 |
$ echo p > p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1019 |
$ hg ci -Amp |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1020 |
adding p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1021 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1022 |
$ 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
|
1023 |
$ 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
|
1024 |
adding a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1025 |
adding b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1026 |
$ echo c > c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1027 |
$ hg ci -Amc |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1028 |
adding c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1029 |
$ hg glog |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1030 |
@ 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
|
1031 |
| |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1032 |
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
|
1033 |
| |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1034 |
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
|
1035 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1036 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1037 |
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
|
1038 |
$ echo 0 > num |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1039 |
$ 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
|
1040 |
> NUM=$(cat num) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1041 |
> 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
|
1042 |
> echo "$NUM" > num |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1043 |
> 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
|
1044 |
> __EOF__ |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1045 |
$ 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
|
1046 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1047 |
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
|
1048 |
$ 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
|
1049 |
> y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1050 |
> y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1051 |
> n |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1052 |
> y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1053 |
> y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1054 |
> y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1055 |
> EOF |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1056 |
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
|
1057 |
adding a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1058 |
adding b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1059 |
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
|
1060 |
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
|
1061 |
examine changes to 'a'? [Ynesfdaq?] y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1062 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1063 |
@@ -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
|
1064 |
+a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1065 |
record change 1/2 to 'a'? [Ynesfdaq?] y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1066 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1067 |
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
|
1068 |
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
|
1069 |
examine changes to 'b'? [Ynesfdaq?] n |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1070 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1071 |
created new head |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1072 |
(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
|
1073 |
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
|
1074 |
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
|
1075 |
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
|
1076 |
examine changes to 'b'? [Ynesfdaq?] y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1077 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1078 |
@@ -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
|
1079 |
+b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1080 |
record this change to 'b'? [Ynesfdaq?] y |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1081 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1082 |
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
|
1083 |
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
|
1084 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1085 |
$ hg glog -p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1086 |
@ 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
|
1087 |
| 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
|
1088 |
| 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
|
1089 |
| --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1090 |
| +++ b/b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1091 |
| @@ -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
|
1092 |
| +b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1093 |
| |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1094 |
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
|
1095 |
| 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
|
1096 |
| 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
|
1097 |
| --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1098 |
| +++ b/a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1099 |
| @@ -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
|
1100 |
| +a |
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 |
| * 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
|
1103 |
| | 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
|
1104 |
| | 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
|
1105 |
| | --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1106 |
| | +++ b/c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1107 |
| | @@ -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
|
1108 |
| | +c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1109 |
| | |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1110 |
| 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
|
1111 |
|/ 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
|
1112 |
| 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
|
1113 |
| --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1114 |
| +++ b/a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1115 |
| @@ -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
|
1116 |
| +a |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1117 |
| 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
|
1118 |
| 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
|
1119 |
| --- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1120 |
| +++ b/b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1121 |
| @@ -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
|
1122 |
| +b |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1123 |
| |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1124 |
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
|
1125 |
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
|
1126 |
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
|
1127 |
--- /dev/null |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1128 |
+++ b/p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1129 |
@@ -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
|
1130 |
+p |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1131 |
|
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1132 |
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
|
1133 |
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
|
1134 |
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
|
1135 |
$ hg prune . |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1136 |
0 files updated, 0 files merged, 1 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
|
1137 |
working directory now at 88437e073cd4 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1138 |
1 changesets pruned |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1139 |
$ 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
|
1140 |
move:[2] c |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1141 |
atop:[3] split1 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1142 |
working directory is now at 21a63bd6ee88 |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1143 |
$ hg glog |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1144 |
@ 5:21a63bd6ee88 c (draft) |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1145 |
| |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1146 |
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
|
1147 |
| |
f45b4c31d81f
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4300
diff
changeset
|
1148 |
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
|
1149 |
|
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1150 |
$ cd .. |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1151 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1152 |
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
|
1153 |
----------------------------------------------------------------------- |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1154 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1155 |
Prepare the repository: |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1156 |
$ hg init issue6048 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1157 |
$ cd issue6048 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1158 |
$ echo a > a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1159 |
$ hg ci -Am "added a" |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1160 |
adding a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1161 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1162 |
$ echo b > b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1163 |
$ echo c > c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1164 |
$ hg add b c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1165 |
$ hg ci -m "added b c" --secret |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1166 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1167 |
$ hg glog -l1 -p --git |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1168 |
@ 1:12e9cc39ba19 added b c (secret) |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1169 |
| diff --git a/b b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1170 |
~ new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1171 |
--- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1172 |
+++ b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1173 |
@@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1174 |
+b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1175 |
diff --git a/c b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1176 |
new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1177 |
--- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1178 |
+++ b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1179 |
@@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1180 |
+c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1181 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1182 |
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
|
1183 |
$ echo 0 > num |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1184 |
$ cat > editor.sh << '__EOF__' |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1185 |
> NUM=$(cat num) |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1186 |
> NUM=`expr "$NUM" + 1` |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1187 |
> echo "$NUM" > num |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1188 |
> echo "split$NUM" > "$1" |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1189 |
> __EOF__ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1190 |
$ export HGEDITOR="\"sh\" \"editor.sh\"" |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1191 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1192 |
Splitting |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1193 |
$ hg split -r . << EOF |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1194 |
> y |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1195 |
> y |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1196 |
> n |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1197 |
> c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1198 |
> EOF |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1199 |
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
|
1200 |
adding b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1201 |
adding c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1202 |
diff --git a/b b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1203 |
new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1204 |
examine changes to 'b'? [Ynesfdaq?] y |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1205 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1206 |
@@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1207 |
+b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1208 |
record change 1/2 to 'b'? [Ynesfdaq?] y |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1209 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1210 |
diff --git a/c b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1211 |
new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1212 |
examine changes to 'c'? [Ynesfdaq?] n |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1213 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1214 |
created new head |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1215 |
(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
|
1216 |
continue splitting? [Ycdq?] c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1217 |
|
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1218 |
$ 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
|
1219 |
@ 3:1f8c09b13fa2 split2 (secret) |
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1220 |
| diff --git a/c b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1221 |
| new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1222 |
| --- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1223 |
| +++ b/c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1224 |
| @@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1225 |
| +c |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1226 |
| |
4410
8087e9a0f902
split: make sure hg split preserve the phase of splitting cset (issue6048)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4409
diff
changeset
|
1227 |
o 2:bcba06966846 split1 (secret) |
4409
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1228 |
| diff --git a/b b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1229 |
| new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1230 |
| --- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1231 |
| +++ b/b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1232 |
| @@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1233 |
| +b |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1234 |
| |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1235 |
o 0:9092f1db7931 added a (draft) |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1236 |
diff --git a/a b/a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1237 |
new file mode 100644 |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1238 |
--- /dev/null |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1239 |
+++ b/a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1240 |
@@ -0,0 +1,1 @@ |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1241 |
+a |
2a593d8f07e7
split: add tests which demonstrate the issue6048
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4345
diff
changeset
|
1242 |