Mercurial > hg
annotate tests/test-rebase-partial.t @ 44120:35cd52c4a5cc
py3: conditionalize test-flagprocessor.t on Python 3.8
For reasons I don't understand, Python 3.8 is outputting a different
lint in the traceback than prior Pythons.
The lines in question are:
flagutil.addflagprocessor(
REVIDX_NOOP, (noopdonothingread, noopdonothing, validatehash,)
)
Python <3.8 prints the 2nd line but 3.8 the first line. Perhaps Python
changed its traceback logic to always print the first line of a
multiple line expression?
Whatever the case, with this change, the test now passes on
Python 3.8.
Differential Revision: https://phab.mercurial-scm.org/D7945
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 18 Jan 2020 10:12:41 -0800 |
parents | 5abc47d4ca6b |
children | dc5e5577af39 |
rev | line source |
---|---|
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
1 Tests rebasing with part of the rebase set already in the |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
2 destination (issue5422) |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
3 |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
4 $ cat >> $HGRCPATH <<EOF |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
5 > [extensions] |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
6 > rebase= |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
7 > drawdag=$TESTDIR/drawdag.py |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
8 > |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
9 > [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
33844
diff
changeset
|
10 > evolution.createmarkers=True |
34867
7f183c643eb6
config: use 'experimental.evolution.allowunstable'
Boris Feld <boris.feld@octobus.net>
parents:
34866
diff
changeset
|
11 > evolution.allowunstable=True |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
12 > |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
13 > [alias] |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
14 > tglog = log -G --template "{rev}: {node|short} {desc}" |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
15 > EOF |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
16 |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
17 $ rebasewithdag() { |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36981
diff
changeset
|
18 > N=`"$PYTHON" -c "print($N+1)"` |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
19 > hg init repo$N && cd repo$N |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
20 > hg debugdrawdag |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
21 > hg rebase "$@" > _rebasetmp |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
22 > r=$? |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
23 > grep -v 'saved backup bundle' _rebasetmp |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
24 > [ $r -eq 0 ] && hg tglog |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
25 > cd .. |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
26 > return $r |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
27 > } |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
28 |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
29 Rebase two commits, of which one is already in the right place |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
30 |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
31 $ rebasewithdag -r C+D -d B <<EOF |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
32 > C |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
33 > | |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
34 > B D |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
35 > |/ |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
36 > A |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
37 > EOF |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
38 rebasing 2:b18e25de2cf5 "D" (D) |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
39 already rebased 3:26805aba1e60 "C" (C tip) |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
40 o 4: fe3b4c6498fa D |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
41 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
42 | o 3: 26805aba1e60 C |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
43 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
44 | x 2: b18e25de2cf5 D |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
45 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
46 o | 1: 112478962961 B |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
47 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
48 o 0: 426bada5c675 A |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
49 |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
50 Can collapse commits even if one is already in the right place |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
51 |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
52 $ rebasewithdag --collapse -r C+D -d B <<EOF |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
53 > C |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
54 > | |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
55 > B D |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
56 > |/ |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
57 > A |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
58 > EOF |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
59 rebasing 2:b18e25de2cf5 "D" (D) |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
60 rebasing 3:26805aba1e60 "C" (C tip) |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
61 o 4: a2493f4ace65 Collapsed revision |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
62 | * D |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
63 | * C |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
64 | x 3: 26805aba1e60 C |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
65 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
66 | x 2: b18e25de2cf5 D |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
67 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
68 o | 1: 112478962961 B |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
69 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
70 o 0: 426bada5c675 A |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
71 |
36979
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
72 Abort doesn't lose the commits that were already in the right place |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
73 |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
74 $ hg init abort |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
75 $ cd abort |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
76 $ hg debugdrawdag <<EOF |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
77 > C |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
78 > | |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
79 > B D # B/file = B |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
80 > |/ # D/file = D |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
81 > A |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
82 > EOF |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
83 $ hg rebase -r C+D -d B |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
84 rebasing 2:ef8c0fe0897b "D" (D) |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
85 merging file |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
86 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
87 unresolved conflicts (see hg resolve, then hg rebase --continue) |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
88 [1] |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
89 $ hg rebase --abort |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
90 rebase aborted |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
91 $ hg tglog |
36981
177f3b90335f
rebase: on abort, don't strip commits that didn't need rebased (issue5822)
Martin von Zweigbergk <martinvonz@google.com>
parents:
36979
diff
changeset
|
92 o 3: 79f6d6ab7b14 C |
36979
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
93 | |
36981
177f3b90335f
rebase: on abort, don't strip commits that didn't need rebased (issue5822)
Martin von Zweigbergk <martinvonz@google.com>
parents:
36979
diff
changeset
|
94 | o 2: ef8c0fe0897b D |
177f3b90335f
rebase: on abort, don't strip commits that didn't need rebased (issue5822)
Martin von Zweigbergk <martinvonz@google.com>
parents:
36979
diff
changeset
|
95 | | |
177f3b90335f
rebase: on abort, don't strip commits that didn't need rebased (issue5822)
Martin von Zweigbergk <martinvonz@google.com>
parents:
36979
diff
changeset
|
96 o | 1: 594087dbaf71 B |
36979
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
97 |/ |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
98 o 0: 426bada5c675 A |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
99 |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
100 $ cd .. |
b9a6ee2066f9
tests: demonstrate aborted rebase strips commits that didn't need rebasing
Martin von Zweigbergk <martinvonz@google.com>
parents:
35385
diff
changeset
|
101 |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
102 Rebase with "holes". The commits after the hole should end up on the parent of |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
103 the hole (B below), not on top of the destination (A). |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
104 |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
105 $ rebasewithdag -r B+D -d A <<EOF |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
106 > D |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
107 > | |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
108 > C |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
109 > | |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
110 > B |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
111 > | |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
112 > A |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
113 > EOF |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
114 already rebased 1:112478962961 "B" (B) |
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
115 rebasing 3:f585351a92f8 "D" (D tip) |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
116 o 4: 1e6da8103bc7 D |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
117 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
118 | x 3: f585351a92f8 D |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
119 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
120 | o 2: 26805aba1e60 C |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
121 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
122 o 1: 112478962961 B |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
123 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34867
diff
changeset
|
124 o 0: 426bada5c675 A |
32272
78496ac30025
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
125 |