Mercurial > hg
annotate tests/test-rebase-rename.t @ 46924:ca0049946e9a
split: avoid strip if split is a no-op (identical to original)
Differential Revision: https://phab.mercurial-scm.org/D10389
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Mon, 12 Apr 2021 19:25:34 -0700 |
parents | 1703a7f9d5b8 |
children |
rev | line source |
---|---|
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
2 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
3 > rebase= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
4 > |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
5 > [alias] |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
6 > tlog = log --template "{rev}: {node|short} '{desc}' {branches}\n" |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
7 > tglog = tlog --graph |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
8 > EOF |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
9 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
10 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
11 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
12 $ cd a |
11198
b345b1cc124f
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com>
parents:
7954
diff
changeset
|
13 |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
14 $ mkdir d |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
15 $ echo a > a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
16 $ hg ci -Am A |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
17 adding a |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
18 |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
19 $ echo b > d/b |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
20 $ hg ci -Am B |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
21 adding d/b |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
22 |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
23 $ hg mv d d-renamed |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
24 moving d/b to d-renamed/b |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
25 $ hg ci -m 'rename B' |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
26 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
27 $ hg up -q -C 1 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
28 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
29 $ hg mv a a-renamed |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
30 $ echo x > d/x |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
31 $ hg add d/x |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
32 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
33 $ hg ci -m 'rename A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
34 created new head |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
35 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
36 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
37 @ 3: 73a3ee40125d 'rename A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
38 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
39 | o 2: 220d0626d185 'rename B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
40 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
41 o 1: 3ab5da9a5c01 'B' |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
42 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
43 o 0: 1994f17a630e 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
44 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
45 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
46 Rename is tracked: |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
47 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
48 $ hg tlog -p --git -r tip |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
49 3: 73a3ee40125d 'rename A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
50 diff --git a/a b/a-renamed |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
51 rename from a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
52 rename to a-renamed |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
53 diff --git a/d/x b/d/x |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
54 new file mode 100644 |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
55 --- /dev/null |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
56 +++ b/d/x |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
57 @@ -0,0 +1,1 @@ |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
58 +x |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
59 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
60 Rebase the revision containing the rename: |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
61 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
62 $ hg rebase -s 3 -d 2 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
44146
diff
changeset
|
63 rebasing 3:73a3ee40125d tip "rename A" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
64 saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
65 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
66 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
67 @ 3: 032a9b75e83b 'rename A' |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
68 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
69 o 2: 220d0626d185 'rename B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
70 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
71 o 1: 3ab5da9a5c01 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
72 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
73 o 0: 1994f17a630e 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
74 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
75 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
76 Rename is not lost: |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
77 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
78 $ hg tlog -p --git -r tip |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
79 3: 032a9b75e83b 'rename A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
80 diff --git a/a b/a-renamed |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
81 rename from a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
82 rename to a-renamed |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
83 diff --git a/d-renamed/x b/d-renamed/x |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
84 new file mode 100644 |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
85 --- /dev/null |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
86 +++ b/d-renamed/x |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
87 @@ -0,0 +1,1 @@ |
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
88 +x |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
89 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
90 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
91 Rebased revision does not contain information about b (issue3739) |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
92 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
93 $ hg log -r 3 --debug |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
94 changeset: 3:032a9b75e83bff1dcfb6cbfa4ef50a704bf1b569 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
95 tag: tip |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
96 phase: draft |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
97 parent: 2:220d0626d185f372d9d8f69d9c73b0811d7725f7 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
98 parent: -1:0000000000000000000000000000000000000000 |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
99 manifest: 3:035d66b27a1b06b2d12b46d41a39adb7a200c370 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
100 user: test |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
101 date: Thu Jan 01 00:00:00 1970 +0000 |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
102 files+: a-renamed d-renamed/x |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
103 files-: a |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
104 extra: branch=default |
18739
5b7175377bab
setparents: drop copies from dropped p2 (issue3843)
Matt Mackall <mpm@selenic.com>
parents:
18136
diff
changeset
|
105 extra: rebase_source=73a3ee40125d6f0f347082e5831ceccb3f005f8a |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
106 description: |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
107 rename A |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
108 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
109 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
110 |
44146
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
111 $ repeatchange() { |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
112 > hg checkout $1 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
113 > hg cp a z |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
114 > echo blah >> z |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
115 > hg commit -Am "$2" --user "$3" |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
116 > } |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
117 $ repeatchange 1 "E" "user1" |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
118 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
119 created new head |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
120 $ repeatchange 1 "E" "user2" |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
121 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
122 created new head |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
123 $ hg tglog |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
124 @ 5: af8ad1f97097 'E' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
125 | |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
126 | o 4: 60f545c27784 'E' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
127 |/ |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
128 | o 3: 032a9b75e83b 'rename A' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
129 | | |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
130 | o 2: 220d0626d185 'rename B' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
131 |/ |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
132 o 1: 3ab5da9a5c01 'B' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
133 | |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
134 o 0: 1994f17a630e 'A' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
135 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
136 $ hg rebase -s 5 -d 4 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
44146
diff
changeset
|
137 rebasing 5:af8ad1f97097 tip "E" |
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
44146
diff
changeset
|
138 note: not rebasing 5:af8ad1f97097 tip "E", its destination already has all its changes |
44146
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
139 saved backup bundle to $TESTTMP/a/.hg/strip-backup/af8ad1f97097-c3e90708-rebase.hg |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
140 $ hg tglog |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
141 @ 4: 60f545c27784 'E' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
142 | |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
143 | o 3: 032a9b75e83b 'rename A' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
144 | | |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
145 | o 2: 220d0626d185 'rename B' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
146 |/ |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
147 o 1: 3ab5da9a5c01 'B' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
148 | |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
149 o 0: 1994f17a630e 'A' |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
150 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
151 $ hg export tip |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
152 # HG changeset patch |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
153 # User user1 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
154 # Date 0 0 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
155 # Thu Jan 01 00:00:00 1970 +0000 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
156 # Node ID 60f545c277846e6bad309919bae3ae106f59cb39 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
157 # Parent 3ab5da9a5c01faa02c20f2ec4870a4f689c92da6 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
158 E |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
159 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
160 diff -r 3ab5da9a5c01 -r 60f545c27784 z |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
161 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
162 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
163 @@ -0,0 +1,2 @@ |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
164 +a |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
165 +blah |
45ec64d93b3a
tests: move non-collapse test out of test-rebase-collapse
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
166 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
167 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
168 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
169 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
170 $ hg init b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
171 $ cd b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
172 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
173 $ echo a > a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
174 $ hg ci -Am A |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
175 adding a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
176 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
177 $ echo b > b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
178 $ hg ci -Am B |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
179 adding b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
180 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
181 $ hg cp b b-copied |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
182 $ hg ci -Am 'copy B' |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
183 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
184 $ hg up -q -C 1 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
185 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
186 $ hg cp a a-copied |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
187 $ hg ci -m 'copy A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
188 created new head |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
189 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
190 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
191 @ 3: 0a8162ff18a8 'copy A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
192 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
193 | o 2: 39e588434882 'copy B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
194 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
195 o 1: 6c81ed0049f8 'B' |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
196 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
197 o 0: 1994f17a630e 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
198 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
199 Copy is tracked: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
200 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
201 $ hg tlog -p --git -r tip |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
202 3: 0a8162ff18a8 'copy A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
203 diff --git a/a b/a-copied |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
204 copy from a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
205 copy to a-copied |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
206 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
207 Rebase the revision containing the copy: |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
208 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
209 $ hg rebase -s 3 -d 2 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
44146
diff
changeset
|
210 rebasing 3:0a8162ff18a8 tip "copy A" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
211 saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
212 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
213 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
214 @ 3: 98f6e6dbf45a 'copy A' |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
215 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
216 o 2: 39e588434882 'copy B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
217 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
218 o 1: 6c81ed0049f8 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
219 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
220 o 0: 1994f17a630e 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
221 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
222 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
223 Copy is not lost: |
7954
b969611064ae
rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
224 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
225 $ hg tlog -p --git -r tip |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
226 3: 98f6e6dbf45a 'copy A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
227 diff --git a/a b/a-copied |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
228 copy from a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
229 copy to a-copied |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
230 |
18136
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
231 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
232 Rebased revision does not contain information about b (issue3739) |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
233 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
234 $ hg log -r 3 --debug |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
235 changeset: 3:98f6e6dbf45ab54079c2237fbd11066a5c41a11d |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
236 tag: tip |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
237 phase: draft |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
238 parent: 2:39e588434882ff77d01229d169cdc77f29e8855e |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
239 parent: -1:0000000000000000000000000000000000000000 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
240 manifest: 3:2232f329d66fffe3930d43479ae624f66322b04d |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
241 user: test |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
242 date: Thu Jan 01 00:00:00 1970 +0000 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
243 files+: a-copied |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
244 extra: branch=default |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
245 extra: rebase_source=0a8162ff18a8900df8df8ef7ac0046955205613e |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
246 description: |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
247 copy A |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
248 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
249 |
f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
250 |
13778
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
251 $ cd .. |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
252 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
253 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
254 Test rebase across repeating renames: |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
255 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
256 $ hg init repo |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
257 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
258 $ cd repo |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
259 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
260 $ echo testing > file1.txt |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
261 $ hg add file1.txt |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
262 $ hg ci -m "Adding file1" |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
263 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
264 $ hg rename file1.txt file2.txt |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
265 $ hg ci -m "Rename file1 to file2" |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
266 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
267 $ echo Unrelated change > unrelated.txt |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
268 $ hg add unrelated.txt |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
269 $ hg ci -m "Unrelated change" |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
270 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
271 $ hg rename file2.txt file1.txt |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
272 $ hg ci -m "Rename file2 back to file1" |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
273 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
274 $ hg update -r -2 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
275 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
276 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
277 $ echo Another unrelated change >> unrelated.txt |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
278 $ hg ci -m "Another unrelated change" |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
279 created new head |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
280 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
281 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
282 @ 4: b918d683b091 'Another unrelated change' |
13778
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
283 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
284 | o 3: 1ac17e43d8aa 'Rename file2 back to file1' |
13778
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
285 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
286 o 2: 480101d66d8d 'Unrelated change' |
13778
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
287 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
288 o 1: be44c61debd2 'Rename file1 to file2' |
13778
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
289 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
290 o 0: 8ce9a346991d 'Adding file1' |
13778
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
291 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
292 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
293 $ hg rebase -s 4 -d 3 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
44146
diff
changeset
|
294 rebasing 4:b918d683b091 tip "Another unrelated change" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
295 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg |
13778
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
296 |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
297 $ hg diff --stat -c . |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
298 unrelated.txt | 1 + |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
299 1 files changed, 1 insertions(+), 0 deletions(-) |
46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
300 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13778
diff
changeset
|
301 $ cd .. |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
302 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
303 Verify that copies get preserved (issue4192). |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
304 $ hg init copy-gets-preserved |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
305 $ cd copy-gets-preserved |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
306 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
307 $ echo a > a |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
308 $ hg add a |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
309 $ hg commit --message "File a created" |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
310 $ hg copy a b |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
311 $ echo b > b |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
312 $ hg commit --message "File b created as copy of a and modified" |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
313 $ hg copy b c |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
314 $ echo c > c |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
315 $ hg commit --message "File c created as copy of b and modified" ## |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
316 $ hg copy c d |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
317 $ echo d > d |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
318 $ hg commit --message "File d created as copy of c and modified (child of 327f772bc074)" |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
319 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
320 Note that there are four entries in the log for d |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
321 $ hg tglog --follow d |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
322 @ 3: 6be224292cfa 'File d created as copy of c and modified (child of 327f772bc074)' |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
323 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
324 o 2: 327f772bc074 'File c created as copy of b and modified' |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
325 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
326 o 1: 79d255d24ad2 'File b created as copy of a and modified' |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
327 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
328 o 0: b220cd6d2326 'File a created' |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
329 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
330 Update back to before we performed copies, and inject an unrelated change. |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
331 $ hg update 0 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
332 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
333 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
334 $ echo unrelated > unrelated |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
335 $ hg add unrelated |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
336 $ hg commit --message "Unrelated file created" |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
337 created new head |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
338 $ hg update 4 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
339 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
340 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
341 Rebase the copies on top of the unrelated change. |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
342 $ hg rebase --source 1 --dest 4 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
343 rebasing 1:79d255d24ad2 "File b created as copy of a and modified" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
344 rebasing 2:327f772bc074 "File c created as copy of b and modified" |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
345 rebasing 3:6be224292cfa "File d created as copy of c and modified (child of 327f772bc074)" |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
346 saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a3e674e3-rebase.hg |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
347 $ hg update 4 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
348 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
349 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
350 There should still be four entries in the log for d |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
351 $ hg tglog --follow d |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
352 @ 4: afbdde3a60d5 'File d created as copy of c and modified (child of af74b229bc02)' |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
353 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
354 o 3: af74b229bc02 'File c created as copy of b and modified' |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
355 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
356 o 2: 68bf06433839 'File b created as copy of a and modified' |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
26811
diff
changeset
|
357 : |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
358 o 0: b220cd6d2326 'File a created' |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
359 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
360 Same steps as above, but with --collapse on rebase to make sure the |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
361 copy records collapse correctly. |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
362 $ hg co 1 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
363 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
364 $ echo more >> unrelated |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
365 $ hg ci -m 'unrelated commit is unrelated' |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
366 created new head |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
367 $ hg rebase -s 2 --dest 5 --collapse |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
368 rebasing 2:68bf06433839 "File b created as copy of a and modified" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
369 rebasing 3:af74b229bc02 "File c created as copy of b and modified" |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
370 merging b and c to c |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
371 rebasing 4:afbdde3a60d5 "File d created as copy of c and modified (child of af74b229bc02)" |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
372 merging c and d to d |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
373 saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-29d5057f-rebase.hg |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
374 $ hg co tip |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
375 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
376 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
377 This should show both revision 3 and 0 since 'd' was transitively a |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
378 copy of 'a'. |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
379 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
380 $ hg tglog --follow d |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
381 @ 3: 75708a266e56 'Collapsed revision |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
26811
diff
changeset
|
382 : * File b created as copy of a and modified |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
26811
diff
changeset
|
383 : * File c created as copy of b and modified |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
384 : * File d created as copy of c and modified (child of af74b229bc02)' |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
33332
diff
changeset
|
385 o 0: b220cd6d2326 'File a created' |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
386 |
45792
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
387 $ hg log -G -Tcompact |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
388 @ 3[tip] 75708a266e56 1970-01-01 00:00 +0000 test |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
389 | Collapsed revision |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
390 | |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
391 o 2 15258cf0cf10 1970-01-01 00:00 +0000 test |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
392 | unrelated commit is unrelated |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
393 | |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
394 o 1 1d689898494b 1970-01-01 00:00 +0000 test |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
395 | Unrelated file created |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
396 | |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
397 o 0 b220cd6d2326 1970-01-01 00:00 +0000 test |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
398 File a created |
1703a7f9d5b8
rebase: update commit hash references in the new commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
45771
diff
changeset
|
399 |
21826
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
400 |
2ba6c9b4e0eb
rebase: fix bug that caused transitive copy records to disappear (issue4192)
Augie Fackler <raf@durin42.com>
parents:
20117
diff
changeset
|
401 $ cd .. |