Mercurial > hg
comparison tests/test-subrepo-deep-nested-change.t @ 25615:dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
This is more useful than reporting all 'f's, allowing the archive to be diffed
against a specific revision to see what changed.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 16 Jun 2015 23:14:45 -0400 |
parents | 3ec8351fa6ed |
children | 98064baab877 |
comparison
equal
deleted
inserted
replaced
25614:6c48f012d37e | 25615:dc707fb35550 |
---|---|
185 ../wdir/sub1/foo | 185 ../wdir/sub1/foo |
186 ../wdir/sub1/sub1 | 186 ../wdir/sub1/sub1 |
187 ../wdir/sub1/sub2/folder/test.txt | 187 ../wdir/sub1/sub2/folder/test.txt |
188 ../wdir/sub1/sub2/sub2 | 188 ../wdir/sub1/sub2/sub2 |
189 | 189 |
190 $ cat ../wdir/.hg_archival.txt | |
191 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a | |
192 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+ | |
193 branch: default | |
194 latesttag: null | |
195 latesttagdistance: 4 | |
196 changessincelatesttag: 3 | |
197 | |
190 Attempting to archive 'wdir()' with a missing file is handled gracefully | 198 Attempting to archive 'wdir()' with a missing file is handled gracefully |
191 $ rm sub1/sub1 | 199 $ rm sub1/sub1 |
192 $ rm -r ../wdir | 200 $ rm -r ../wdir |
193 $ hg archive -v -S -r 'wdir()' ../wdir | 201 $ hg archive -v -S -r 'wdir()' ../wdir |
194 $ find ../wdir -type f | sort | 202 $ find ../wdir -type f | sort |
202 ../wdir/sub1/sub2/folder/test.txt | 210 ../wdir/sub1/sub2/folder/test.txt |
203 ../wdir/sub1/sub2/sub2 | 211 ../wdir/sub1/sub2/sub2 |
204 | 212 |
205 Continue relative path printing + subrepos | 213 Continue relative path printing + subrepos |
206 $ hg update -Cq | 214 $ hg update -Cq |
215 $ rm -r ../wdir | |
216 $ hg archive -S -r 'wdir()' ../wdir | |
217 $ cat ../wdir/.hg_archival.txt | |
218 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a | |
219 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd | |
220 branch: default | |
221 latesttag: null | |
222 latesttagdistance: 4 | |
223 changessincelatesttag: 3 | |
224 | |
207 $ touch sub1/sub2/folder/bar | 225 $ touch sub1/sub2/folder/bar |
208 $ hg addremove sub1/sub2 | 226 $ hg addremove sub1/sub2 |
209 adding sub1/sub2/folder/bar (glob) | 227 adding sub1/sub2/folder/bar (glob) |
210 $ hg status -S | 228 $ hg status -S |
211 A sub1/sub2/folder/bar | 229 A sub1/sub2/folder/bar |