Show More
@@ -2,6 +2,8 b'' | |||
|
2 | 2 | |
|
3 | 3 | make git commits repeatable |
|
4 | 4 | |
|
5 | $ echo "[core]" >> $HOME/.gitconfig | |
|
6 | $ echo "autocrlf = false" >> $HOME/.gitconfig | |
|
5 | 7 | $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
|
6 | 8 | $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
|
7 | 9 | $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE |
@@ -133,7 +135,7 b' clone root separately, make different lo' | |||
|
133 | 135 | user b push changes |
|
134 | 136 | |
|
135 | 137 | $ hg push 2>/dev/null |
|
136 | pushing to $TESTTMP/t | |
|
138 | pushing to $TESTTMP/t (glob) | |
|
137 | 139 | pushing branch testing of subrepo s |
|
138 | 140 | searching for changes |
|
139 | 141 | adding changesets |
@@ -145,7 +147,7 b' user a pulls, merges, commits' | |||
|
145 | 147 | |
|
146 | 148 | $ cd ../ta |
|
147 | 149 | $ hg pull |
|
148 | pulling from $TESTTMP/t | |
|
150 | pulling from $TESTTMP/t (glob) | |
|
149 | 151 | searching for changes |
|
150 | 152 | adding changesets |
|
151 | 153 | adding manifests |
@@ -173,7 +175,7 b' user a pulls, merges, commits' | |||
|
173 | 175 | source ../gitroot |
|
174 | 176 | revision f47b465e1bce645dbf37232a00574aa1546ca8d3 |
|
175 | 177 | $ hg push 2>/dev/null |
|
176 | pushing to $TESTTMP/t | |
|
178 | pushing to $TESTTMP/t (glob) | |
|
177 | 179 | pushing branch testing of subrepo s |
|
178 | 180 | searching for changes |
|
179 | 181 | adding changesets |
@@ -205,7 +207,7 b' make and push changes to hg without upda' | |||
|
205 | 207 | $ echo aa >> a |
|
206 | 208 | $ hg commit -m aa |
|
207 | 209 | $ hg push |
|
208 | pushing to $TESTTMP/t | |
|
210 | pushing to $TESTTMP/t (glob) | |
|
209 | 211 | searching for changes |
|
210 | 212 | adding changesets |
|
211 | 213 | adding manifests |
@@ -292,7 +294,7 b' nested commit' | |||
|
292 | 294 | M inner/s/f |
|
293 | 295 | $ hg commit --subrepos -m nested |
|
294 | 296 | committing subrepository inner |
|
295 | committing subrepository inner/s | |
|
297 | committing subrepository inner/s (glob) | |
|
296 | 298 | |
|
297 | 299 | nested archive |
|
298 | 300 | |
@@ -509,8 +511,14 b' Test subrepo already at intended revisio' | |||
|
509 | 511 | |
|
510 | 512 | Test forgetting files, not implemented in git subrepo, used to |
|
511 | 513 | traceback |
|
514 | #if no-windows | |
|
512 | 515 | $ hg forget 'notafile*' |
|
513 | 516 | notafile*: No such file or directory |
|
514 | 517 | [1] |
|
518 | #else | |
|
519 | $ hg forget 'notafile' | |
|
520 | notafile: * (glob) | |
|
521 | [1] | |
|
522 | #endif | |
|
515 | 523 | |
|
516 | 524 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now