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