Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-dirstate-future
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 08 Feb 2010 19:44:04 +0100
changeset 10396 65a90c8e11ee
parent 9378 1a7bcf58ba56
permissions -rwxr-xr-x
prepush: add more precise error messages Part of the patch is from timeless@mozdev.org - indicate the branch name where there are multiple heads - give better advice when hitting a possible race, where new heads are added between discovery and the call to branchmap(). In that case, asking the user to merge isn't helpful, since only remote has the changes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9378
1a7bcf58ba56 dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset 
     1
 
#!/bin/sh
1a7bcf58ba56 dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset 
     2
 












1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




     3


hg init













1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




     4


echo a > a













1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




     5


hg add













1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




     6


hg ci -m1













1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




     7














1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




     8


# set mtime of a into the future













1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




     9


touch -t 202101011200 a













1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




    10














1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




    11


# status must not set a's entry to unset (issue1790)













1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




    12


hg status













1a7bcf58ba56
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)



Adrian Buehlmann <adrian@cadifra.com>


parents: 

diff
changeset




    13


hg debugstate















hg-stable