##// END OF EJS Templates
rebase: format commit in usual way when explaining that it became empty...
Martin von Zweigbergk -
r40899:09680349 default
parent child Browse files
Show More
@@ -573,8 +573,8 b' class rebaseruntime(object):'
573 ui.debug('rebased as %s\n' % short(newnode))
573 ui.debug('rebased as %s\n' % short(newnode))
574 else:
574 else:
575 if not self.collapsef:
575 if not self.collapsef:
576 ui.warn(_('note: rebase of %d:%s created no changes '
576 ui.warn(_('note: rebase of %s created no changes '
577 'to commit\n') % (rev, ctx))
577 'to commit\n') % desc)
578 self.skipped.add(rev)
578 self.skipped.add(rev)
579 self.state[rev] = p1
579 self.state[rev] = p1
580 ui.debug('next revision set to %d\n' % p1)
580 ui.debug('next revision set to %d\n' % p1)
@@ -206,7 +206,7 b' Rebase and abort without generating new '
206
206
207 $ hg rebase -b 4 -d 2
207 $ hg rebase -b 4 -d 2
208 rebasing 3:a6484957d6b9 "B bis"
208 rebasing 3:a6484957d6b9 "B bis"
209 note: rebase of 3:a6484957d6b9 created no changes to commit
209 note: rebase of 3:a6484957d6b9 "B bis" created no changes to commit
210 rebasing 4:145842775fec "C1" (tip)
210 rebasing 4:145842775fec "C1" (tip)
211 merging c
211 merging c
212 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
212 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
@@ -493,7 +493,7 b' commit will cause merge conflict on reba'
493 $ hg commit -m 'add content draft' -q
493 $ hg commit -m 'add content draft' -q
494
494
495 $ hg rebase -d 'public()' --tool :merge -q
495 $ hg rebase -d 'public()' --tool :merge -q
496 note: rebase of 3:0682fd3dabf5 created no changes to commit
496 note: rebase of 3:0682fd3dabf5 "disappear draft" created no changes to commit
497 warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
497 warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
498 unresolved conflicts (see hg resolve, then hg rebase --continue)
498 unresolved conflicts (see hg resolve, then hg rebase --continue)
499 [1]
499 [1]
@@ -231,7 +231,7 b' Rebase entire branch3 (7-8) onto branch2'
231
231
232 $ hg rebase -s 7 -d 6
232 $ hg rebase -s 7 -d 6
233 rebasing 7:653b9feb4616 "branch3"
233 rebasing 7:653b9feb4616 "branch3"
234 note: rebase of 7:653b9feb4616 created no changes to commit
234 note: rebase of 7:653b9feb4616 "branch3" created no changes to commit
235 rebasing 8:4666b71e8e32 "F" (tip)
235 rebasing 8:4666b71e8e32 "F" (tip)
236 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg
236 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg
237
237
@@ -500,7 +500,7 b' Interactions between collapse and keepbr'
500
500
501 $ hg rebase -s 5 -d 4
501 $ hg rebase -s 5 -d 4
502 rebasing 5:fbfb97b1089a "E" (tip)
502 rebasing 5:fbfb97b1089a "E" (tip)
503 note: rebase of 5:fbfb97b1089a created no changes to commit
503 note: rebase of 5:fbfb97b1089a "E" (tip) created no changes to commit
504 saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg
504 saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg
505 $ hg tglog
505 $ hg tglog
506 @ 4: f338eb3c2c7c 'E'
506 @ 4: f338eb3c2c7c 'E'
@@ -304,7 +304,7 b' Ensure --continue restores a correct sta'
304 continue: hg rebase --continue
304 continue: hg rebase --continue
305 $ hg rebase -c
305 $ hg rebase -c
306 rebasing 3:17b4880d2402 "B2" (tip)
306 rebasing 3:17b4880d2402 "B2" (tip)
307 note: rebase of 3:17b4880d2402 created no changes to commit
307 note: rebase of 3:17b4880d2402 "B2" (tip) created no changes to commit
308 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg
308 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg
309 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
309 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
310 o 2:draft 'C'
310 o 2:draft 'C'
@@ -51,9 +51,9 b' With --keep, bookmark should move'
51
51
52 $ hg rebase -r 3+4 -d E --keep
52 $ hg rebase -r 3+4 -d E --keep
53 rebasing 3:e7b3f00ed42e "D" (BOOK-D)
53 rebasing 3:e7b3f00ed42e "D" (BOOK-D)
54 note: rebase of 3:e7b3f00ed42e created no changes to commit
54 note: rebase of 3:e7b3f00ed42e "D" (BOOK-D) created no changes to commit
55 rebasing 4:69a34c08022a "E" (BOOK-E)
55 rebasing 4:69a34c08022a "E" (BOOK-E)
56 note: rebase of 4:69a34c08022a created no changes to commit
56 note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit
57 $ hg log -G -T '{rev} {desc} {bookmarks}'
57 $ hg log -G -T '{rev} {desc} {bookmarks}'
58 o 7 E BOOK-D BOOK-E
58 o 7 E BOOK-D BOOK-E
59 |
59 |
@@ -84,9 +84,9 b' still introduced by an ancestor of chang'
84 $ hg rebase -s 2 -d E
84 $ hg rebase -s 2 -d E
85 rebasing 2:dc0947a82db8 "C" (BOOK-C C)
85 rebasing 2:dc0947a82db8 "C" (BOOK-C C)
86 rebasing 3:e7b3f00ed42e "D" (BOOK-D)
86 rebasing 3:e7b3f00ed42e "D" (BOOK-D)
87 note: rebase of 3:e7b3f00ed42e created no changes to commit
87 note: rebase of 3:e7b3f00ed42e "D" (BOOK-D) created no changes to commit
88 rebasing 4:69a34c08022a "E" (BOOK-E)
88 rebasing 4:69a34c08022a "E" (BOOK-E)
89 note: rebase of 4:69a34c08022a created no changes to commit
89 note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit
90 rebasing 5:6b2aeab91270 "F" (BOOK-F F)
90 rebasing 5:6b2aeab91270 "F" (BOOK-F F)
91 saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
91 saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
92 $ hg log -G -T '{rev} {desc} {bookmarks}'
92 $ hg log -G -T '{rev} {desc} {bookmarks}'
@@ -131,11 +131,11 b' Merge and its ancestors all become empty'
131
131
132 $ hg rebase -r '(A::)-(B::)-A' -d H
132 $ hg rebase -r '(A::)-(B::)-A' -d H
133 rebasing 2:dc0947a82db8 "C" (BOOK-C)
133 rebasing 2:dc0947a82db8 "C" (BOOK-C)
134 note: rebase of 2:dc0947a82db8 created no changes to commit
134 note: rebase of 2:dc0947a82db8 "C" (BOOK-C) created no changes to commit
135 rebasing 3:b18e25de2cf5 "D" (BOOK-D)
135 rebasing 3:b18e25de2cf5 "D" (BOOK-D)
136 note: rebase of 3:b18e25de2cf5 created no changes to commit
136 note: rebase of 3:b18e25de2cf5 "D" (BOOK-D) created no changes to commit
137 rebasing 4:86a1f6686812 "E" (BOOK-E E)
137 rebasing 4:86a1f6686812 "E" (BOOK-E E)
138 note: rebase of 4:86a1f6686812 created no changes to commit
138 note: rebase of 4:86a1f6686812 "E" (BOOK-E E) created no changes to commit
139 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
139 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
140
140
141 $ hg log -G -T '{rev} {desc} {bookmarks}'
141 $ hg log -G -T '{rev} {desc} {bookmarks}'
@@ -180,11 +180,11 b' Part of ancestors of a merge become empt'
180
180
181 $ hg rebase -r '(A::)-(B::)-A' -d H
181 $ hg rebase -r '(A::)-(B::)-A' -d H
182 rebasing 2:dc0947a82db8 "C" (BOOK-C)
182 rebasing 2:dc0947a82db8 "C" (BOOK-C)
183 note: rebase of 2:dc0947a82db8 created no changes to commit
183 note: rebase of 2:dc0947a82db8 "C" (BOOK-C) created no changes to commit
184 rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
184 rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
185 rebasing 4:03ca77807e91 "E" (BOOK-E E)
185 rebasing 4:03ca77807e91 "E" (BOOK-E E)
186 rebasing 5:ad6717a6a58e "F" (BOOK-F)
186 rebasing 5:ad6717a6a58e "F" (BOOK-F)
187 note: rebase of 5:ad6717a6a58e created no changes to commit
187 note: rebase of 5:ad6717a6a58e "F" (BOOK-F) created no changes to commit
188 rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
188 rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
189 saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
189 saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
190
190
@@ -454,7 +454,7 b' Make sure merge state is cleaned up afte'
454 continue: hg rebase --continue
454 continue: hg rebase --continue
455 $ hg rebase --continue
455 $ hg rebase --continue
456 rebasing 1:fdaca8533b86 "b"
456 rebasing 1:fdaca8533b86 "b"
457 note: rebase of 1:fdaca8533b86 created no changes to commit
457 note: rebase of 1:fdaca8533b86 "b" created no changes to commit
458 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
458 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
459 $ hg resolve --list
459 $ hg resolve --list
460 $ test -d .hg/merge
460 $ test -d .hg/merge
@@ -62,7 +62,7 b' already has one local mq patch'
62 committing changelog
62 committing changelog
63 rebasing 3:148775c71080 "P1" (p1.patch qtip)
63 rebasing 3:148775c71080 "P1" (p1.patch qtip)
64 resolving manifests
64 resolving manifests
65 note: rebase of 3:148775c71080 created no changes to commit
65 note: rebase of 3:148775c71080 "P1" (p1.patch qtip) created no changes to commit
66 rebase merging completed
66 rebase merging completed
67 updating mq patch p0.patch to 5:9ecc820b1737
67 updating mq patch p0.patch to 5:9ecc820b1737
68 $TESTTMP/a/.hg/patches/p0.patch
68 $TESTTMP/a/.hg/patches/p0.patch
@@ -143,10 +143,10 b' already has one local mq patch'
143
143
144 $ HGMERGE=internal:fail hg rebase
144 $ HGMERGE=internal:fail hg rebase
145 rebasing 1:b4bffa6e4776 "r1" (qbase r1)
145 rebasing 1:b4bffa6e4776 "r1" (qbase r1)
146 note: rebase of 1:b4bffa6e4776 created no changes to commit
146 note: rebase of 1:b4bffa6e4776 "r1" (qbase r1) created no changes to commit
147 rebasing 2:c0fd129beb01 "r2" (r2)
147 rebasing 2:c0fd129beb01 "r2" (r2)
148 rebasing 3:6ff5b8feed8e "r3" (r3)
148 rebasing 3:6ff5b8feed8e "r3" (r3)
149 note: rebase of 3:6ff5b8feed8e created no changes to commit
149 note: rebase of 3:6ff5b8feed8e "r3" (r3) created no changes to commit
150 rebasing 4:094320fec554 "r4" (r4)
150 rebasing 4:094320fec554 "r4" (r4)
151 unresolved conflicts (see hg resolve, then hg rebase --continue)
151 unresolved conflicts (see hg resolve, then hg rebase --continue)
152 [1]
152 [1]
@@ -160,10 +160,10 b' already has one local mq patch'
160 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a
160 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a
161 already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a
161 already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a
162 rebasing 4:094320fec554 "r4" (r4)
162 rebasing 4:094320fec554 "r4" (r4)
163 note: rebase of 4:094320fec554 created no changes to commit
163 note: rebase of 4:094320fec554 "r4" (r4) created no changes to commit
164 rebasing 5:681a378595ba "r5" (r5)
164 rebasing 5:681a378595ba "r5" (r5)
165 rebasing 6:512a1f24768b "r6" (qtip r6)
165 rebasing 6:512a1f24768b "r6" (qtip r6)
166 note: rebase of 6:512a1f24768b created no changes to commit
166 note: rebase of 6:512a1f24768b "r6" (qtip r6) created no changes to commit
167 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg
167 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg
168
168
169 $ hg tglog
169 $ hg tglog
@@ -337,7 +337,7 b' removed from the series):'
337 foo
337 foo
338 $ [ -f .hg/patches/empty-important ]
338 $ [ -f .hg/patches/empty-important ]
339 $ hg -q rebase -d 2
339 $ hg -q rebase -d 2
340 note: rebase of 1:0aaf4c3af7eb created no changes to commit
340 note: rebase of 1:0aaf4c3af7eb "important commit message" (empty-important qbase) created no changes to commit
341 $ hg qseries
341 $ hg qseries
342 guarded
342 guarded
343 bar
343 bar
@@ -157,7 +157,7 b' Branch name containing a dash (issue3181'
157
157
158 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches
158 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches
159 rebasing 5:bc8139ee757c "dev-one named branch"
159 rebasing 5:bc8139ee757c "dev-one named branch"
160 note: rebase of 5:bc8139ee757c created no changes to commit
160 note: rebase of 5:bc8139ee757c "dev-one named branch" created no changes to commit
161 rebasing 6:42aa3cf0fa7a "F"
161 rebasing 6:42aa3cf0fa7a "F"
162 rebasing 7:1a1e6f72ec38 "G"
162 rebasing 7:1a1e6f72ec38 "G"
163 rebasing 8:904590360559 "H"
163 rebasing 8:904590360559 "H"
@@ -329,7 +329,7 b" rebase 'b2' to another lower branch head"
329 $ hg up -qr 2
329 $ hg up -qr 2
330 $ hg rebase
330 $ hg rebase
331 rebasing 2:792845bb77ee "b2"
331 rebasing 2:792845bb77ee "b2"
332 note: rebase of 2:792845bb77ee created no changes to commit
332 note: rebase of 2:792845bb77ee "b2" created no changes to commit
333 saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg
333 saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg
334 $ hg tglog
334 $ hg tglog
335 o 2: c062e3ecd6c6 'c1' c
335 o 2: c062e3ecd6c6 'c1' c
@@ -395,7 +395,7 b" rebase 'c1' to the branch head 'c2' that"
395 $ hg rebase -r 3:: -d .
395 $ hg rebase -r 3:: -d .
396 rebasing 3:76abc1c6f8c7 "b1"
396 rebasing 3:76abc1c6f8c7 "b1"
397 rebasing 4:8427af5d86f2 "c2 closed" (tip)
397 rebasing 4:8427af5d86f2 "c2 closed" (tip)
398 note: rebase of 4:8427af5d86f2 created no changes to commit
398 note: rebase of 4:8427af5d86f2 "c2 closed" (tip) created no changes to commit
399 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg
399 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg
400 $ hg tglog
400 $ hg tglog
401 o 3: 117b0ed08075 'b1' x
401 o 3: 117b0ed08075 'b1' x
@@ -130,7 +130,7 b' Full rebase all the way back from branch'
130 > c
130 > c
131 > EOF
131 > EOF
132 rebasing 1:1d1a643d390e "dev: create branch"
132 rebasing 1:1d1a643d390e "dev: create branch"
133 note: rebase of 1:1d1a643d390e created no changes to commit
133 note: rebase of 1:1d1a643d390e "dev: create branch" created no changes to commit
134 rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
134 rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
135 rebasing 4:4b019212aaf6 "dev: merge default"
135 rebasing 4:4b019212aaf6 "dev: merge default"
136 file 'f-default' was deleted in local [dest] but was modified in other [source].
136 file 'f-default' was deleted in local [dest] but was modified in other [source].
@@ -129,10 +129,10 b' set.'
129 grafting 3:32af7686d403 "D"
129 grafting 3:32af7686d403 "D"
130 $ hg rebase -s 42ccdea3bb16 -d .
130 $ hg rebase -s 42ccdea3bb16 -d .
131 rebasing 1:42ccdea3bb16 "B"
131 rebasing 1:42ccdea3bb16 "B"
132 note: rebase of 1:42ccdea3bb16 created no changes to commit
132 note: rebase of 1:42ccdea3bb16 "B" created no changes to commit
133 rebasing 2:5fddd98957c8 "C"
133 rebasing 2:5fddd98957c8 "C"
134 rebasing 3:32af7686d403 "D"
134 rebasing 3:32af7686d403 "D"
135 note: rebase of 3:32af7686d403 created no changes to commit
135 note: rebase of 3:32af7686d403 "D" created no changes to commit
136 $ hg log -G
136 $ hg log -G
137 o 10:5ae4c968c6ac C
137 o 10:5ae4c968c6ac C
138 |
138 |
@@ -1456,7 +1456,7 b' Rebase merge where successor of one pare'
1456 rebasing 2:b18e25de2cf5 "D" (D)
1456 rebasing 2:b18e25de2cf5 "D" (D)
1457 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
1457 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
1458 rebasing 5:66f1a38021c9 "F" (F tip)
1458 rebasing 5:66f1a38021c9 "F" (F tip)
1459 note: rebase of 5:66f1a38021c9 created no changes to commit
1459 note: rebase of 5:66f1a38021c9 "F" (F tip) created no changes to commit
1460 $ hg log -G
1460 $ hg log -G
1461 o 6:8f47515dda15 D
1461 o 6:8f47515dda15 D
1462 |
1462 |
@@ -1492,7 +1492,7 b' Rebase merge where successor of other pa'
1492 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
1492 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
1493 rebasing 3:7fb047a69f22 "E" (E)
1493 rebasing 3:7fb047a69f22 "E" (E)
1494 rebasing 5:66f1a38021c9 "F" (F tip)
1494 rebasing 5:66f1a38021c9 "F" (F tip)
1495 note: rebase of 5:66f1a38021c9 created no changes to commit
1495 note: rebase of 5:66f1a38021c9 "F" (F tip) created no changes to commit
1496
1496
1497 $ hg log -G
1497 $ hg log -G
1498 o 6:533690786a86 E
1498 o 6:533690786a86 E
@@ -440,7 +440,7 b' Test --tool parameter:'
440
440
441 $ hg rebase -s 2 -d 1 --tool internal:local
441 $ hg rebase -s 2 -d 1 --tool internal:local
442 rebasing 2:e4e3f3546619 "c2b" (tip)
442 rebasing 2:e4e3f3546619 "c2b" (tip)
443 note: rebase of 2:e4e3f3546619 created no changes to commit
443 note: rebase of 2:e4e3f3546619 "c2b" (tip) created no changes to commit
444 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
444 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
445
445
446 $ hg cat c2
446 $ hg cat c2
@@ -493,7 +493,7 b' Test --tool parameter:'
493 [255]
493 [255]
494 $ hg rebase -c --tool internal:fail
494 $ hg rebase -c --tool internal:fail
495 rebasing 2:e4e3f3546619 "c2b" (tip)
495 rebasing 2:e4e3f3546619 "c2b" (tip)
496 note: rebase of 2:e4e3f3546619 created no changes to commit
496 note: rebase of 2:e4e3f3546619 "c2b" (tip) created no changes to commit
497 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
497 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
498
498
499 $ hg rebase -i
499 $ hg rebase -i
@@ -138,7 +138,7 b' if they have the same contents)'
138 $ hg rebase -s 4 -d 7
138 $ hg rebase -s 4 -d 7
139 rebasing 4:9520eea781bc "E"
139 rebasing 4:9520eea781bc "E"
140 rebasing 6:eea13746799a "G"
140 rebasing 6:eea13746799a "G"
141 note: rebase of 6:eea13746799a created no changes to commit
141 note: rebase of 6:eea13746799a "G" created no changes to commit
142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
143 $ f E.orig
143 $ f E.orig
144 E.orig: file not found
144 E.orig: file not found
@@ -169,7 +169,7 b' F onto E - rebase of a branching point ('
169 $ hg rebase -s 5 -d 4
169 $ hg rebase -s 5 -d 4
170 rebasing 5:24b6387c8c8c "F"
170 rebasing 5:24b6387c8c8c "F"
171 rebasing 6:eea13746799a "G"
171 rebasing 6:eea13746799a "G"
172 note: rebase of 6:eea13746799a created no changes to commit
172 note: rebase of 6:eea13746799a "G" created no changes to commit
173 rebasing 7:02de42196ebe "H" (tip)
173 rebasing 7:02de42196ebe "H" (tip)
174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
175
175
@@ -87,7 +87,7 b''
87 $ hg pull -q
87 $ hg pull -q
88 $ hg rebase -d tip
88 $ hg rebase -d tip
89 rebasing 1:4549721d828f "xx2"
89 rebasing 1:4549721d828f "xx2"
90 note: rebase of 1:4549721d828f created no changes to commit
90 note: rebase of 1:4549721d828f "xx2" created no changes to commit
91 rebasing 2:5ef6d97e851c "xxy"
91 rebasing 2:5ef6d97e851c "xxy"
92 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob)
92 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob)
93 $ hg log -f x --template '{node|short}\n'
93 $ hg log -f x --template '{node|short}\n'
General Comments 0
You need to be logged in to leave comments. Login now