Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 33842:30573b3d2ebc
rebase: move obsoleted not rebased messages earlier (BC)
A later patch will clean up those states. This patch moves the messages
earlier.
Marked as BC since the order of message has changed.
Differential Revision: https://phab.mercurial-scm.org/D23
author | Jun Wu <quark@fb.com> |
---|---|
date | Sat, 08 Jul 2017 20:14:33 -0700 |
parents | 19f495fef0a3 |
children | d8d0ef5f5975 |
comparison
equal
deleted
inserted
replaced
33841:35fc5e919675 | 33842:30573b3d2ebc |
---|---|
203 | o 4:9520eea781bc E | 203 | o 4:9520eea781bc E |
204 |/ | 204 |/ |
205 o 0:cd010b8cd998 A | 205 o 0:cd010b8cd998 A |
206 | 206 |
207 $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True | 207 $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True |
208 note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" | |
208 rebasing 8:8877864f1edb "B" | 209 rebasing 8:8877864f1edb "B" |
209 note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" | |
210 rebasing 10:5ae4c968c6ac "C" | 210 rebasing 10:5ae4c968c6ac "C" |
211 $ hg debugobsolete | 211 $ hg debugobsolete |
212 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | 212 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
213 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | 213 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
214 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | 214 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) |
738 o 0:4a2df7238c3b A | 738 o 0:4a2df7238c3b A |
739 | 739 |
740 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all | 740 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all |
741 obsoleted 1 changesets | 741 obsoleted 1 changesets |
742 $ hg rebase -d 6 -r "4::" | 742 $ hg rebase -d 6 -r "4::" |
743 note: not rebasing 7:360bbaa7d3ce "O", it has no successor | |
743 rebasing 4:ff2c4d47b71d "C" | 744 rebasing 4:ff2c4d47b71d "C" |
744 note: not rebasing 7:360bbaa7d3ce "O", it has no successor | |
745 rebasing 8:8d47583e023f "P" (tip) | 745 rebasing 8:8d47583e023f "P" (tip) |
746 | 746 |
747 If all the changeset to be rebased are obsolete and present in the destination, we | 747 If all the changeset to be rebased are obsolete and present in the destination, we |
748 should display a friendly error message | 748 should display a friendly error message |
749 | 749 |
906 |/ | 906 |/ |
907 o 17:61bd55f69bc4 bar foo | 907 o 17:61bd55f69bc4 bar foo |
908 | | 908 | |
909 ~ | 909 ~ |
910 $ hg rebase -r ".^^ + .^ + ." -d 19 | 910 $ hg rebase -r ".^^ + .^ + ." -d 19 |
911 note: not rebasing 21:8b31da3c4919 "dummy change", already in destination as 19:601db7a18f51 "dummy change successor" | |
911 rebasing 20:b82fb57ea638 "willconflict second version" | 912 rebasing 20:b82fb57ea638 "willconflict second version" |
912 merging willconflict | 913 merging willconflict |
913 warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark') | 914 warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark') |
914 unresolved conflicts (see hg resolve, then hg rebase --continue) | 915 unresolved conflicts (see hg resolve, then hg rebase --continue) |
915 [1] | 916 [1] |
917 $ hg resolve --mark willconflict | 918 $ hg resolve --mark willconflict |
918 (no more unresolved files) | 919 (no more unresolved files) |
919 continue: hg rebase --continue | 920 continue: hg rebase --continue |
920 $ hg rebase --continue | 921 $ hg rebase --continue |
921 rebasing 20:b82fb57ea638 "willconflict second version" | 922 rebasing 20:b82fb57ea638 "willconflict second version" |
922 note: not rebasing 21:8b31da3c4919 "dummy change", already in destination as 19:601db7a18f51 "dummy change successor" | |
923 rebasing 22:7bdc8a87673d "dummy change" (tip) | 923 rebasing 22:7bdc8a87673d "dummy change" (tip) |
924 $ cd .. | 924 $ cd .. |
925 | 925 |
926 Rebase merge where successor of one parent is equal to destination (issue5198) | 926 Rebase merge where successor of one parent is equal to destination (issue5198) |
927 | 927 |
1064 > \|/ | 1064 > \|/ |
1065 > A | 1065 > A |
1066 > EOF | 1066 > EOF |
1067 | 1067 |
1068 $ hg rebase -d C -b F | 1068 $ hg rebase -d C -b F |
1069 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" | |
1069 rebasing 2:b18e25de2cf5 "D" (D) | 1070 rebasing 2:b18e25de2cf5 "D" (D) |
1070 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" | |
1071 rebasing 5:66f1a38021c9 "F" (F tip) | 1071 rebasing 5:66f1a38021c9 "F" (F tip) |
1072 warning: rebasing 5:66f1a38021c9 may include unwanted changes from 3:7fb047a69f22 | 1072 warning: rebasing 5:66f1a38021c9 may include unwanted changes from 3:7fb047a69f22 |
1073 $ hg log -G | 1073 $ hg log -G |
1074 o 7:9ed45af61fa0 F | 1074 o 7:9ed45af61fa0 F |
1075 | | 1075 | |