##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

verify: check the subrepository references in .hgsubstate...
verify: check the subrepository references in .hgsubstate While hopefully atypical, there are reasons that a subrepository revision can be lost that aren't covered by corruption of the .hgsubstate revlog. Such things can happen when a subrepo is amended, stripped or simply isn't pulled from upstream because the parent repo revision wasn't updated yet. There's no way to know if it is an error, but this will find potential problems sooner than when some random revision is updated. Until recently, convert made no attempt at rewriting the .hgsubstate file. The impetuous for this is to verify the conversion of some repositories, and this is orders of magnitude faster than a bash script from 0..tip that does an 'hg update -C $rev'. But it is equally useful to determine if everything has been pulled down before taking a thumb drive on the go. It feels somewhat wrong to leave this out of verifymod (mostly because the file is already read in there, and the final summary is printed before the subrepos are checked). But verifymod looks very low level, so importing subrepo stuff there seems more wrong.
Pierre-Yves David - - Load All Authors

File last commit:

r21693:9c35f3a8 default
r25591:f1d46075 default
Show More
test-merge-revert2.t
94 lines | 1.9 KiB | text/troff | Tads3Lexer
/ tests / test-merge-revert2.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
combine tests
 r12279 $ hg init
$ echo "added file1" > file1
$ echo "another line of text" >> file1
$ echo "added file2" > file2
$ hg add file1 file2
$ hg commit -m "added file1 and file2"
$ echo "changed file1" >> file1
$ hg commit -m "changed file1"
$ hg -q log
1:dfab7f3c2efb
0:c3fa057dd86f
$ hg id
dfab7f3c2efb tip
$ hg update -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id
c3fa057dd86f
$ echo "changed file1" >> file1
$ hg id
c3fa057dd86f+
$ hg revert --no-backup --all
reverting file1
$ hg diff
$ hg status
$ hg id
c3fa057dd86f
$ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg diff
$ hg status
$ hg id
dfab7f3c2efb tip
$ hg update -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "changed file1 different" >> file1
$ hg update
merging file1
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
 r15501 merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
Adrian Buehlmann
combine tests
 r12279 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
combine tests
 r12279
$ hg diff --nodates
diff -r dfab7f3c2efb file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@
added file1
another line of text
Pierre-Yves David
merge: drop the quotes around commit description...
 r21693 +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2
Adrian Buehlmann
combine tests
 r12279 +changed file1 different
+=======
changed file1
Pierre-Yves David
merge: drop the quotes around commit description...
 r21693 +>>>>>>> destination: dfab7f3c2efb - test: changed file1
Adrian Buehlmann
combine tests
 r12279
$ hg status
M file1
? file1.orig
$ hg id
dfab7f3c2efb+ tip
$ hg revert --no-backup --all
reverting file1
$ hg diff
$ hg status
? file1.orig
$ hg id
dfab7f3c2efb tip
$ hg revert -r tip --no-backup --all
$ hg diff
$ hg status
? file1.orig
$ hg id
dfab7f3c2efb tip
$ hg update -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg diff
$ hg status
? file1.orig
$ hg id
dfab7f3c2efb tip