Mercurial > hg
comparison tests/test-histedit-commute.t @ 17086:5f2cacb715dc
tests: make histedit tests more resilient to filesystem variation
Better quoting of odd filesystem paths and no dependency to execute bit.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sat, 30 Jun 2012 03:34:50 +0200 |
| parents | 35729bdd59b6 |
| children | a79776f427b4 |
comparison
equal
deleted
inserted
replaced
| 17085:35729bdd59b6 | 17086:5f2cacb715dc |
|---|---|
| 77 # m, mess = edit message without changing commit content | 77 # m, mess = edit message without changing commit content |
| 78 # | 78 # |
| 79 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 79 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 80 | 80 |
| 81 edit the history | 81 edit the history |
| 82 $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle | 82 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
| 83 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 83 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 84 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 84 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 85 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 85 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 87 | 87 |
| 132 > pick 177f92b77385 c | 132 > pick 177f92b77385 c |
| 133 > pick 853c68da763f d | 133 > pick 853c68da763f d |
| 134 > pick b069cc29fb22 e | 134 > pick b069cc29fb22 e |
| 135 > pick 26f6a030ae82 f | 135 > pick 26f6a030ae82 f |
| 136 > EOF | 136 > EOF |
| 137 $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle | 137 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
| 138 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 138 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 139 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 139 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 140 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 140 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 141 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 141 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 142 | 142 |
| 179 > pick 055a42cdd887 d | 179 > pick 055a42cdd887 d |
| 180 > pick 652413bf663e f | 180 > pick 652413bf663e f |
| 181 > pick e860deea161a e | 181 > pick e860deea161a e |
| 182 > pick 177f92b77385 c | 182 > pick 177f92b77385 c |
| 183 > EOF | 183 > EOF |
| 184 $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle | 184 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
| 185 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 185 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 186 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 186 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 187 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 187 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 188 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 188 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 189 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 189 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 225 > pick bfe4a5a76b37 d | 225 > pick bfe4a5a76b37 d |
| 226 > pick c4f52e213402 f | 226 > pick c4f52e213402 f |
| 227 > pick 99a62755c625 c | 227 > pick 99a62755c625 c |
| 228 > pick 7c6fdd608667 e | 228 > pick 7c6fdd608667 e |
| 229 > EOF | 229 > EOF |
| 230 $ HGEDITOR="cat $EDITED > " hg histedit bfe4a5a76b37 --keep 2>&1 | fixbundle | 230 $ HGEDITOR="cat \"$EDITED\" > " hg histedit bfe4a5a76b37 --keep 2>&1 | fixbundle |
| 231 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 231 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 232 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 232 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 233 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 233 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 234 $ hg log --graph | 234 $ hg log --graph |
| 235 > cat > $EDITED <<EOF | 235 > cat > $EDITED <<EOF |