author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 25 Apr 2018 01:58:45 +0100 | |
branch | mercurial-4.3 |
changeset 3716 | e5ba6531503e |
parent 3591 | 98941c28f3e2 |
child 3936 | 537fd9a86c06 |
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 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
7 |
> [defaults] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
8 |
> amend=-d "0 0" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
9 |
> fold=-d "0 0" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
10 |
> split=-d "0 0" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
11 |
> amend=-d "0 0" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
12 |
> [web] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
13 |
> push_ssl = false |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
14 |
> allow_push = * |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
15 |
> [phases] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
16 |
> publish = False |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
17 |
> [diff] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
18 |
> git = 1 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
19 |
> unified = 0 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
20 |
> [ui] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
21 |
> interactive = true |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
22 |
> [extensions] |
2775
1d16c9dcb825
test: use common setup for test-split.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2771
diff
changeset
|
23 |
> evolve = |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
24 |
> EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
25 |
$ mkcommit() { |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
26 |
> echo "$1" > "$1" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
27 |
> 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
|
28 |
> hg ci -m "add $1" $2 $3 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
29 |
> } |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
30 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
31 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
32 |
Basic case, split a head |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
33 |
$ hg init testsplit |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
34 |
$ cd testsplit |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
35 |
$ mkcommit _a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
36 |
$ 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
|
37 |
$ mkcommit _c --user other-test-user |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
38 |
$ mkcommit _d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
39 |
$ echo "change to a" >> _a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
40 |
$ hg amend |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
41 |
$ hg debugobsolete |
3103
13cafb250c1a
test-compat: revert ouput related to operation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3060
diff
changeset
|
42 |
1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
43 |
06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob) |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
44 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
45 |
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
|
46 |
$ echo 0 > num |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
47 |
$ cat > editor.sh << '__EOF__' |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
48 |
> NUM=$(cat num) |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
49 |
> NUM=`expr "$NUM" + 1` |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
50 |
> echo "$NUM" > num |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
51 |
> echo "split$NUM" > "$1" |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
52 |
> __EOF__ |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
53 |
$ export HGEDITOR="\"sh\" \"editor.sh\"" |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
54 |
$ hg split << EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
55 |
> y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
56 |
> y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
57 |
> y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
58 |
> n |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
59 |
> N |
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 |
> y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
62 |
> EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
63 |
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
|
64 |
reverting _a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
65 |
adding _d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
66 |
diff --git a/_a b/_a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
67 |
1 hunks, 1 lines changed |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
68 |
examine changes to '_a'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
69 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
70 |
@@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
71 |
+change to a |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
72 |
record change 1/2 to '_a'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
73 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
74 |
diff --git a/_d b/_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
75 |
new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
76 |
examine changes to '_d'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
77 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
78 |
@@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
79 |
+_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
80 |
record change 2/2 to '_d'? [Ynesfdaq?] n |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
81 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
82 |
created new head |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
83 |
Done splitting? [yN] N |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
84 |
diff --git a/_d b/_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
85 |
new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
86 |
examine changes to '_d'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
87 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
88 |
@@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
89 |
+_d |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
90 |
record this change to '_d'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
91 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
92 |
no more change to split |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
93 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
94 |
$ hg debugobsolete |
3591
98941c28f3e2
test-compat: merge mercurial-4.4 into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
95 |
1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
98941c28f3e2
test-compat: merge mercurial-4.4 into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
96 |
06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} |
3716
e5ba6531503e
testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3591
diff
changeset
|
97 |
d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2775
diff
changeset
|
98 |
$ hg log -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
99 |
@ changeset: 7:033b3f5ae73d |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
100 |
| tag: tip |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
101 |
| user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
102 |
| 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
|
103 |
| summary: split2 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
104 |
| |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
105 |
o changeset: 6: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
|
106 |
| parent: 2:52149352b372 |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
107 |
| user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
108 |
| 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
|
109 |
| summary: split1 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
110 |
| |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
111 |
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
|
112 |
| user: other-test-user |
1482
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
113 |
| 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
|
114 |
| summary: add _c |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
115 |
| |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
116 |
o changeset: 1:37445b16603b |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
117 |
| user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
118 |
| 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
|
119 |
| summary: add _b |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
120 |
| |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
121 |
o changeset: 0:135f39f4bd78 |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
122 |
user: test |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
123 |
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
|
124 |
summary: add _a |
c7726b19c7a0
split: fix commit message numbering error in the test
Laurent Charignon <lcharignon@fb.com>
parents:
1478
diff
changeset
|
125 |
|
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
126 |
|
1672 | 127 |
Cannot split a commit with uncommitted changes |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
128 |
$ hg up "desc(_c)" |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
129 |
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
|
130 |
$ 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
|
131 |
$ hg split |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
132 |
abort: uncommitted changes |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
133 |
[255] |
2786
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
134 |
$ hg up "desc(_c)" -C |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
135 |
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
|
136 |
|
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
137 |
Cannot split public changeset |
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 |
$ hg phase --rev 'desc("_a")' |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
140 |
0: draft |
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")' --public |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
142 |
$ hg split --rev 'desc("_a")' |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
143 |
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
|
144 |
(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
|
145 |
[255] |
ae690d39fc92
split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
146 |
$ hg phase --rev 'desc("_a")' --draft --force |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
147 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
148 |
Split a revision specified with -r |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
149 |
$ echo "change to b" >> _b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
150 |
$ hg amend -m "_cprim" |
3106
a867d59ea97a
test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3105
diff
changeset
|
151 |
2 new unstable changesets |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
152 |
$ hg evolve --all |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
153 |
move:[6] split1 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
154 |
atop:[9] _cprim |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
155 |
move:[7] split2 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
156 |
atop:[10] split1 |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
157 |
working directory is now at * (glob) |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
158 |
$ hg log -r "desc(_cprim)" -v -p |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
159 |
changeset: 9:b434287e665c |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
160 |
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
|
161 |
user: other-test-user |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
162 |
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
|
163 |
files: _b _c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
164 |
description: |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
165 |
_cprim |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
166 |
|
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 |
diff --git a/_b b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
169 |
--- a/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
170 |
+++ b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
171 |
@@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
172 |
+change to b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
173 |
diff --git a/_c b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
174 |
new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
175 |
--- /dev/null |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
176 |
+++ b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
177 |
@@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
178 |
+_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
179 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
180 |
$ hg split -r "desc(_cprim)" <<EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
181 |
> y |
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 |
> n |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
185 |
> y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
186 |
> EOF |
1484
e3484e9632cd
split: don't update before it is actually needed
Laurent Charignon <lcharignon@fb.com>
parents:
1483
diff
changeset
|
187 |
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
|
188 |
reverting _b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
189 |
adding _c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
190 |
diff --git a/_b b/_b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
191 |
1 hunks, 1 lines changed |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
192 |
examine changes to '_b'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
193 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
194 |
@@ -1,0 +2,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
195 |
+change to b |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
196 |
record change 1/2 to '_b'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
197 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
198 |
diff --git a/_c b/_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
199 |
new file mode 100644 |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
200 |
examine changes to '_c'? [Ynesfdaq?] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
201 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
202 |
@@ -0,0 +1,1 @@ |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
203 |
+_c |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
204 |
record change 2/2 to '_c'? [Ynesfdaq?] n |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
205 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
206 |
created new head |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
207 |
Done splitting? [yN] y |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
208 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
209 |
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
|
210 |
remaining changes |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
211 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
212 |
$ hg debugobsolete |
3103
13cafb250c1a
test-compat: revert ouput related to operation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3060
diff
changeset
|
213 |
1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
214 |
06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob) |
3716
e5ba6531503e
testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3591
diff
changeset
|
215 |
d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} |
3103
13cafb250c1a
test-compat: revert ouput related to operation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3060
diff
changeset
|
216 |
52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (*) {'ef1': '9', 'user': 'test'} (glob) |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
217 |
7a4fc25a48a5797bb069563854455aecf738d8f2 0 {52149352b372d39b19127d5bd2d488b1b63f9f85} (*) {'ef1': '0', 'user': 'test'} (glob) |
3716
e5ba6531503e
testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3591
diff
changeset
|
218 |
2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} |
e5ba6531503e
testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3591
diff
changeset
|
219 |
033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} |
e5ba6531503e
testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3591
diff
changeset
|
220 |
b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
221 |
$ hg evolve --all |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
222 |
move:[10] split1 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
223 |
atop:[13] split4 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
224 |
move:[11] split2 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
225 |
atop:[14] split1 |
2659
166ca0aba0ea
split: preserve author of the original changeset in the successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
226 |
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
|
227 |
$ hg log -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
228 |
@ changeset: 15:d74c6715e706 |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
229 |
| tag: tip |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
230 |
| user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
231 |
| 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
|
232 |
| summary: split2 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
233 |
| |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
234 |
o changeset: 14:3f134f739075 |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
235 |
| user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
236 |
| 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
|
237 |
| summary: split1 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
238 |
| |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
239 |
o changeset: 13: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
|
240 |
| user: other-test-user |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
241 |
| 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
|
242 |
| summary: split4 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
243 |
| |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
244 |
o changeset: 12:ead2066d1dbf |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
245 |
| 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
|
246 |
| user: other-test-user |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
247 |
| 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
|
248 |
| summary: split3 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
249 |
| |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
250 |
o changeset: 1:37445b16603b |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
251 |
| user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
252 |
| 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
|
253 |
| summary: add _b |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
254 |
| |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
255 |
o changeset: 0:135f39f4bd78 |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
256 |
user: test |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
257 |
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
|
258 |
summary: add _a |
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
259 |
|
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
260 |
|
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
261 |
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
|
262 |
active bookmark as active |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
263 |
$ hg book bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
264 |
$ hg book bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
265 |
$ echo "changetofilea" > _a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
266 |
$ hg amend |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
267 |
$ hg book |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
268 |
bookA 17:7a6b35779b85 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
269 |
* bookB 17:7a6b35779b85 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
270 |
$ hg log -G -r "14::" |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
271 |
@ changeset: 17:7a6b35779b85 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
272 |
| bookmark: bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
273 |
| bookmark: bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
274 |
| tag: tip |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
275 |
| parent: 14:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
276 |
| user: test |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
277 |
| 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
|
278 |
| summary: split2 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
279 |
| |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
280 |
o changeset: 14:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
281 |
| 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
|
282 |
~ 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
|
283 |
summary: split1 |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
284 |
|
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
285 |
$ 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
|
286 |
> y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
287 |
> y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
288 |
> n |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
289 |
> y |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
290 |
> EOF |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
291 |
(leaving bookmark bookB) |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
292 |
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
|
293 |
reverting _a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
294 |
adding _d |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
295 |
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
|
296 |
1 hunks, 2 lines changed |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
297 |
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
|
298 |
|
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
299 |
@@ -1,2 +1,1 @@ |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
300 |
-_a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
301 |
-change to a |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
302 |
+changetofilea |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
303 |
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
|
304 |
|
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
305 |
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
|
306 |
new file mode 100644 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
307 |
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
|
308 |
|
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
309 |
created new head |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
310 |
Done splitting? [yN] y |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
311 |
$ hg log -G -r "14::" |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
312 |
@ changeset: 19:452a26648478 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
313 |
| bookmark: bookA |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
314 |
| bookmark: bookB |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
315 |
| tag: tip |
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
316 |
| user: victor |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
317 |
| 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
|
318 |
| summary: split6 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
319 |
| |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
320 |
o changeset: 18:1315679b77dc |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
321 |
| parent: 14:3f134f739075 |
2770
a9ea16a1f4dc
split: fix the --user option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2667
diff
changeset
|
322 |
| user: victor |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
323 |
| 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
|
324 |
| summary: split5 |
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
325 |
| |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
326 |
o changeset: 14:3f134f739075 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
327 |
| 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
|
328 |
~ 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
|
329 |
summary: split1 |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1598
diff
changeset
|
330 |
|
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
331 |
$ hg book |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
332 |
bookA 19:452a26648478 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
333 |
* bookB 19:452a26648478 |
1485
1ba64be11bf8
split: handle bookmarks instead of leaving them on precursor
Laurent Charignon <lcharignon@fb.com>
parents:
1484
diff
changeset
|
334 |
|
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
335 |
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
|
336 |
$ 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
|
337 |
(leaving bookmark bookB) |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
338 |
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
|
339 |
adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
340 |
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
|
341 |
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
|
342 |
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
|
343 |
[255] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
344 |
|
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
345 |
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
|
346 |
$ cat >> $HGRCPATH <<EOF |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
347 |
> [experimental] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
348 |
> evolution=createmarkers |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
349 |
> evolutioncommands=split |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
350 |
> EOF |
1483
dc1467a629ca
split: add more output to the test
Laurent Charignon <lcharignon@fb.com>
parents:
1482
diff
changeset
|
351 |
$ 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
|
352 |
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
|
353 |
(see 'hg help evolution.instability') |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
354 |
[255] |
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
355 |
|
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
356 |
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
|
357 |
$ echo "[experimental]" >> $HGRCPATH |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
358 |
$ echo "evolution=createmarkers" >> $HGRCPATH |
1478
9603aa1ecdfd
evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
359 |
|
1598
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
360 |
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
|
361 |
$ hg split << EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
362 |
> q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
363 |
> EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
364 |
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
|
365 |
adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
366 |
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
|
367 |
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
|
368 |
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
|
369 |
|
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
370 |
abort: user quit |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
371 |
[255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
372 |
|
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
373 |
Running split with tip revision, specified as unnamed argument |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
374 |
$ hg split . << EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
375 |
> q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
376 |
> EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
377 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
378 |
adding _d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
379 |
diff --git a/_d b/_d |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
380 |
new file mode 100644 |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
381 |
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
|
382 |
|
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
383 |
abort: user quit |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
384 |
[255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
385 |
|
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
386 |
Running split with both unnamed and named revision arguments shows an error msg |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
387 |
$ hg split . --rev .^ << EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
388 |
> q |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
389 |
> EOF |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
390 |
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
|
391 |
(use either `hg split <rs>` or `hg split --rev <rs>`, not both) |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
392 |
[255] |
2a08ef812b84
evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi <ikostia@fb.com>
parents:
1485
diff
changeset
|
393 |
|
1738
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
394 |
Split empty commit (issue5191) |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
395 |
$ hg branch new-branch |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
396 |
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
|
397 |
(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
|
398 |
$ hg commit -m "empty" |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
399 |
$ hg split |
cb5edd4b160c
split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
1672
diff
changeset
|
400 |
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
|
401 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
402 |
Check that split keeps the right topic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
403 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
404 |
$ hg up -r tip |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
405 |
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
|
406 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
407 |
Add topic to the hgrc |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
408 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
409 |
$ echo "[extensions]" >> $HGRCPATH |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
410 |
$ 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
|
411 |
$ 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
|
412 |
marked working directory as topic: mytopic |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
413 |
$ echo babar > babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
414 |
$ echo celeste > celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
415 |
$ 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
|
416 |
$ 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
|
417 |
active topic 'mytopic' grew its first changeset |
2771
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
418 |
$ hg log -r . |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
419 |
changeset: 21:26f72cfaf036 |
2771
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
420 |
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
|
421 |
tag: tip |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
422 |
topic: mytopic |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
423 |
user: victor |
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
424 |
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
|
425 |
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
|
426 |
|
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
427 |
$ hg summary |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
428 |
parent: 21:26f72cfaf036 tip |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
429 |
Works on mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
430 |
branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
431 |
commit: 2 unknown (clean) |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
432 |
update: (current) |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
433 |
phases: 9 draft |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
434 |
topic: mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
435 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
436 |
Split it |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
437 |
|
2771
6044bd16bfb7
split: add support for the -D and -U option
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2770
diff
changeset
|
438 |
$ hg split -U << EOF |
2667
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 |
> Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
441 |
> N |
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 |
> Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
445 |
> EOF |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
446 |
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
|
447 |
adding babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
448 |
adding celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
449 |
diff --git a/babar b/babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
450 |
new file mode 100644 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
451 |
examine changes to 'babar'? [Ynesfdaq?] Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
452 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
453 |
@@ -0,0 +1,1 @@ |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
454 |
+babar |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
455 |
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
|
456 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
457 |
diff --git a/celeste b/celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
458 |
new file mode 100644 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
459 |
examine changes to 'celeste'? [Ynesfdaq?] N |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
460 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
461 |
Done splitting? [yN] Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
462 |
diff --git a/celeste b/celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
463 |
new file mode 100644 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
464 |
examine changes to 'celeste'? [Ynesfdaq?] Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
465 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
466 |
@@ -0,0 +1,1 @@ |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
467 |
+celeste |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
468 |
record this change to 'celeste'? [Ynesfdaq?] Y |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
469 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
470 |
no more change to split |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
471 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
472 |
Check that the topic is still here |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
473 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
474 |
$ hg log -r "tip~1::" |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
475 |
changeset: 22:addcf498f19e |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
476 |
branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
477 |
topic: mytopic |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
478 |
parent: 20:fdb403258632 |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
479 |
user: test |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
480 |
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
|
481 |
summary: split7 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
482 |
|
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3103
diff
changeset
|
483 |
changeset: 23:2532b288af61 |
2667
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
484 |
branch: new-branch |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
485 |
tag: tip |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
486 |
topic: mytopic |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
487 |
user: test |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
488 |
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
|
489 |
summary: split8 |
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
490 |
|
e7079bba383d
topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net>
parents:
2659
diff
changeset
|
491 |
$ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3015
diff
changeset
|
492 |
* 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
|
493 |
|
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 |
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
|
495 |
|
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 |
$ 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
|
497 |
$ 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
|
498 |
$ 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
|
499 |
marked working directory as 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
|
500 |
$ hg commit -m "To be splitted" |
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 |
$ hg log -G -l 3 |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
502 |
@ changeset: 24:8dad923bdb9b |
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
|
503 |
| 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
|
504 |
| 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
|
505 |
| 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
|
506 |
| 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
|
507 |
| 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
|
508 |
| summary: To be splitted |
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 |
| |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
510 |
o changeset: 23:2532b288af61 |
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
|
511 |
| 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
|
512 |
| 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
|
513 |
| 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
|
514 |
| 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
|
515 |
| 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
|
516 |
| |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
517 |
o changeset: 22:addcf498f19e |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
518 |
| 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
|
519 |
~ topic: mytopic |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
520 |
parent: 20:fdb403258632 |
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
|
521 |
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
|
522 |
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
|
523 |
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
|
524 |
|
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 |
$ 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
|
526 |
# 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
|
527 |
# 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
|
528 |
# 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
|
529 |
# 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
|
530 |
# 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
|
531 |
# Node ID 8dad923bdb9bb3b99291caa5baeb03bbc30dfd33 |
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 |
# 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
|
533 |
# EXP-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
|
534 |
To be splitted |
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 |
|
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 |
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
|
537 |
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
|
538 |
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
|
539 |
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
|
540 |
|
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 |
$ 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
|
542 |
> 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 |
> 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
|
544 |
> 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
|
545 |
> 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
|
546 |
> 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
|
547 |
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
|
548 |
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
|
549 |
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
|
550 |
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
|
551 |
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
|
552 |
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
|
553 |
|
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 |
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
|
555 |
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
|
556 |
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
|
557 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
558 |
Done splitting? [yN] 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
|
559 |
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
|
560 |
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
|
561 |
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
|
562 |
|
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 |
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
|
564 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
565 |
The splitted changesets should be on the '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
|
566 |
$ hg log -G -l 3 |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
567 |
@ changeset: 26:56a59faa8af7 |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
568 |
| 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
|
569 |
| 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
|
570 |
| 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
|
571 |
| 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
|
572 |
| 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
|
573 |
| 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
|
574 |
| |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
575 |
o changeset: 25:75695e3e2300 |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
576 |
| 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
|
577 |
| topic: mytopic |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
578 |
| parent: 23:2532b288af61 |
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
|
579 |
| 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
|
580 |
| 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
|
581 |
| 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
|
582 |
| |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
583 |
o changeset: 23:2532b288af61 |
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
|
584 |
| 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
|
585 |
~ 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
|
586 |
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
|
587 |
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
|
588 |
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
|
589 |
|
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 |
|
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 |
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
|
592 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
593 |
$ 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
|
594 |
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
|
595 |
$ 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
|
596 |
$ hg add 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
|
597 |
$ hg commit -m "To be splitted again" |
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 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
599 |
$ 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
|
600 |
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
|
601 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
602 |
$ hg log -G -l 2 |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
603 |
o changeset: 27:b1020d17c364 |
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
|
604 |
| 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
|
605 |
| 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
|
606 |
| 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
|
607 |
| 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
|
608 |
| 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
|
609 |
| summary: To be splitted again |
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 |
| |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
611 |
@ changeset: 26:56a59faa8af7 |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
612 |
| 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
|
613 |
~ 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
|
614 |
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
|
615 |
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
|
616 |
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
|
617 |
|
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 |
$ hg branch |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
619 |
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
|
620 |
|
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 |
$ 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
|
622 |
> 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
|
623 |
> 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
|
624 |
> 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
|
625 |
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
|
626 |
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
|
627 |
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
|
628 |
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
|
629 |
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
|
630 |
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
|
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 |
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
|
633 |
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
|
634 |
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
|
635 |
|
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 |
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
|
637 |
[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
|
638 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
639 |
$ hg branch |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
640 |
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
|
641 |
|
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
642 |
$ hg log -G -l 2 |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
643 |
o changeset: 27:b1020d17c364 |
3269
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
644 |
| 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
|
645 |
| 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
|
646 |
| 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
|
647 |
| 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
|
648 |
| 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
|
649 |
| summary: To be splitted again |
e6b980687311
split: add a test demonstrating that split doesn't take the right branch
Boris Feld <boris.feld@octobus.net>
parents:
3060
diff
changeset
|
650 |
| |
3273
c0ee9ddfd5ff
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
651 |
@ changeset: 26:56a59faa8af7 |
3270
e6150b9b88d9
split: force the branch to fix the split bug
Boris Feld <boris.feld@octobus.net>
parents:
3269
diff
changeset
|
652 |
| 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
|
653 |
~ 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
|
654 |
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
|
655 |
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
|
656 |
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
|
657 |