Mercurial > hg
comparison tests/test-histedit-commute.t @ 28004:34165875fa5d
histedit: limit updated and merging output to important updates
Output is retained when:
* There's a conflict
* User asked to edit
* User aborts
otherwise, output is suppressed
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 03 Feb 2016 13:52:04 +0000 |
| parents | b721c9543a4f |
| children | 5490b04e6132 |
comparison
equal
deleted
inserted
replaced
| 28003:a1d4ca0c8483 | 28004:34165875fa5d |
|---|---|
| 102 > pick e860deea161a e | 102 > pick e860deea161a e |
| 103 > pick 652413bf663e f | 103 > pick 652413bf663e f |
| 104 > pick 055a42cdd887 d | 104 > pick 055a42cdd887 d |
| 105 > EOF | 105 > EOF |
| 106 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle | 106 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
| 107 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 108 | 107 |
| 109 log after edit | 108 log after edit |
| 110 $ hg log --graph | 109 $ hg log --graph |
| 111 @ changeset: 5:07114f51870f | 110 @ changeset: 5:07114f51870f |
| 112 | tag: tip | 111 | tag: tip |
| 146 > pick 177f92b77385 c | 145 > pick 177f92b77385 c |
| 147 > pick 07114f51870f d | 146 > pick 07114f51870f d |
| 148 > pick d8249471110a e | 147 > pick d8249471110a e |
| 149 > pick 8ade9693061e f | 148 > pick 8ade9693061e f |
| 150 > EOF | 149 > EOF |
| 151 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 152 | 150 |
| 153 $ hg log --graph | 151 $ hg log --graph |
| 154 @ changeset: 5:7eca9b5b1148 | 152 @ changeset: 5:7eca9b5b1148 |
| 155 | tag: tip | 153 | tag: tip |
| 156 | user: test | 154 | user: test |
| 189 > pick 10517e47bbbb d | 187 > pick 10517e47bbbb d |
| 190 > pick 7eca9b5b1148 f | 188 > pick 7eca9b5b1148 f |
| 191 > pick 915da888f2de e | 189 > pick 915da888f2de e |
| 192 > pick 177f92b77385 c | 190 > pick 177f92b77385 c |
| 193 > EOF | 191 > EOF |
| 194 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
| 195 $ hg log --graph | 192 $ hg log --graph |
| 196 @ changeset: 5:38b92f448761 | 193 @ changeset: 5:38b92f448761 |
| 197 | tag: tip | 194 | tag: tip |
| 198 | user: test | 195 | user: test |
| 199 | date: Thu Jan 01 00:00:00 1970 +0000 | 196 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 230 > pick 799205341b6b d | 227 > pick 799205341b6b d |
| 231 > pick be9ae3a309c6 f | 228 > pick be9ae3a309c6 f |
| 232 > pick 38b92f448761 c | 229 > pick 38b92f448761 c |
| 233 > pick de71b079d9ce e | 230 > pick de71b079d9ce e |
| 234 > EOF | 231 > EOF |
| 235 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 236 $ hg log --graph | 232 $ hg log --graph |
| 237 @ changeset: 7:803ef1c6fcfd | 233 @ changeset: 7:803ef1c6fcfd |
| 238 | tag: tip | 234 | tag: tip |
| 239 | user: test | 235 | user: test |
| 240 | date: Thu Jan 01 00:00:00 1970 +0000 | 236 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 415 > pick 40e7299e8fa7 2 renamed | 411 > pick 40e7299e8fa7 2 renamed |
| 416 > ENDOF | 412 > ENDOF |
| 417 > EOF | 413 > EOF |
| 418 | 414 |
| 419 $ HGEDITOR="sh ./editor.sh" hg histedit 0 | 415 $ HGEDITOR="sh ./editor.sh" hg histedit 0 |
| 420 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 421 adding another-dir/initial-file (glob) | |
| 422 removing initial-dir/initial-file (glob) | |
| 423 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 424 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 425 saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) | 416 saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
| 426 saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) | 417 saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
| 427 | 418 |
| 428 $ hg --config diff.git=yes export 0 | 419 $ hg --config diff.git=yes export 0 |
| 429 # HG changeset patch | 420 # HG changeset patch |